Merge branch 'dev' into hohoTT-dev

2015-08-17 14:49:35 +08:00
parent d88dde18bb a9f4b370cc
commit d828be2a28
18 changed files with 219 additions and 114 deletions
--- a/static/src/js/app/admin/problem/add_problem.js
+++ b/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();
-    });
+    });