Merge branch 'dev' into hohoTT-dev

static/src/js/app/admin/problem/add_problem.js

@@ -93,8 +93,8 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                 $id: "addProblem",
                 title: "",
                 description: "",
-                cpu: 1000,
-                memory: 256,
+                timeLimit: 1000,
+                memoryLimit: 256,
                 samples: [{input: "", output: "", "visible": true}],
                 hint: "",
                 visible: true,
@@ -152,4 +152,4 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
             });
         });
         avalon.scan();
-    });
+    });

static/src/js/app/oj/problem/problem.js

@@ -46,7 +46,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
             results[data.result].message +
             '!   ';
         if (!data.result) {
-            html += "CPU time: " + data.accepted_answer_info.time + "ms   ";
+            html += "CPU time: " + data.accepted_answer_time + "ms   ";
         }
         html += ('<a href="/my_submission/' + submissionId + '/" target="_blank">查看详情</a></div> </div>');