diff --git a/migrations/20160205135326-apps-add-memoryLimit.js b/migrations/20160205135326-apps-add-memoryLimit.js new file mode 100644 index 000000000..ffc1452e8 --- /dev/null +++ b/migrations/20160205135326-apps-add-memoryLimit.js @@ -0,0 +1,15 @@ +dbm = dbm || require('db-migrate'); + +exports.up = function(db, callback) { + db.runSql('ALTER TABLE apps ADD COLUMN memoryLimit INTEGER DEFAULT 0', function (error) { + if (error) console.error(error); + callback(error); + }); +}; + +exports.down = function(db, callback) { + db.runSql('ALTER TABLE apps DROP COLUMN memoryLimit', function (error) { + if (error) console.error(error); + callback(error); + }); +}; diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html index 02019f277..48a5dce43 100644 --- a/webadmin/src/views/apps.html +++ b/webadmin/src/views/apps.html @@ -53,10 +53,10 @@
- +

- +
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js index 9fa6be68c..fc2bf314e 100644 --- a/webadmin/src/views/apps.js +++ b/webadmin/src/views/apps.js @@ -11,7 +11,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location $scope.config = Client.getConfig(); $scope.user = Client.getUserInfo(); - $scope.memoryTicks = [128, 256, 512, 1024, 2048]; + $scope.memoryTicks = [256, 512, 1024, 2048, 4096]; $scope.appConfigure = { busy: false, @@ -26,7 +26,8 @@ angular.module('Application').controller('AppsController', ['$scope', '$location certificateFile: null, certificateFileName: '', keyFile: null, - keyFileName: '' + keyFileName: '', + memoryLimit: 256 }; $scope.appUninstall = {