The application installation was successful.
', function() { + bootbox.alert('The application installation was successful.
', function () { var router = canRoute.router; router.reload(); }); - }, function(response) { + }, function (response) { waitingDialog.modal('hide'); showErrorDialog("Operation failed", response); }); @@ -69,10 +68,10 @@ export default Control.extend({ }); }, - '#install-app-github-btn click': function(el, ev) { + '#install-app-github-btn click': function (el, ev) { bootbox.confirm(templateInstallGithub(), - function(result) { + function (result) { if (result) { var url = 'github://' + $('#url').val(); @@ -88,16 +87,16 @@ export default Control.extend({ show: false }); - waitingDialog.on('shown.bs.modal', function() { + waitingDialog.on('shown.bs.modal', function () { - app.save(function(application) { + app.save(function (application) { waitingDialog.modal('hide'); - bootbox.alert('The application installation was successful.
', function() { + bootbox.alert('The application installation was successful.
', function () { var router = canRoute.router; router.reload(); }); - }, function(response) { + }, function (response) { waitingDialog.modal('hide'); showErrorDialog("Operation failed", response); }); @@ -108,12 +107,12 @@ export default Control.extend({ }); }, - '#reload-apps-btn click': function(el, ev) { + '#reload-apps-btn click': function (el, ev) { var element = this.element; Application.findAll({ reload: 'true' - }, function(applications) { + }, function (applications) { $(element).html(template({ applications: applications @@ -123,12 +122,12 @@ export default Control.extend({ }); }, - '.enable-disable-btn click': function(el, ev) { + '.enable-disable-btn click': function (el, ev) { var card = $(el).closest('.card'); var application = domData.get.call(card[0], 'application'); var enabled = !application.attr('enabled') - bootbox.confirm("Are you sure you want to " + (enabled ? "enable" : "disable") + " application " + application.attr('id') + "?", function(result) { + bootbox.confirm("Are you sure you want to " + (enabled ? "enable" : "disable") + " application " + application.attr('id') + "?", function (result) { if (result) { application.attr('enabled', enabled); @@ -140,13 +139,13 @@ export default Control.extend({ '', show: false }); - waitingDialog.on('shown.bs.modal', function() { + waitingDialog.on('shown.bs.modal', function () { - application.save(function(application) { + application.save(function (application) { waitingDialog.modal('hide'); bootbox.alert('The application has been successfully ' + (enabled ? 'enabled' : 'disabled') + '.
'); - }, function(response) { + }, function (response) { waitingDialog.modal('hide'); showErrorDialog("Operation failed", response); }); @@ -157,12 +156,12 @@ export default Control.extend({ }); }, - '.delete-app-btn click': function(el, ev) { + '.delete-app-btn click': function (el, ev) { var card = $(el).closest('.card'); var application = domData.get.call(card[0], 'application'); - bootbox.confirm("Are you sure you want to delete " + application.attr('id') + "?", function(result) { + bootbox.confirm("Are you sure you want to delete " + application.attr('id') + "?", function (result) { if (result) { var waitingDialog = bootbox.dialog({ @@ -174,13 +173,13 @@ export default Control.extend({ show: false }); - waitingDialog.on('shown.bs.modal', function() { + waitingDialog.on('shown.bs.modal', function () { - application.destroy(function(application) { + application.destroy(function (application) { waitingDialog.modal('hide'); bootbox.alert('The application has been successfully removed.
'); - }, function(response) { + }, function (response) { waitingDialog.modal('hide'); showErrorDialog("Operation failed", response); }); @@ -193,65 +192,37 @@ export default Control.extend({ }, - '.edit-settings-btn click': function(el, ev) { - - var card = $(el).closest('.card'); - var application = domData.get.call(card[0], 'application'); - - - bootbox.confirm(templateSettings({ - application: application - }), - function(result) { - if (result) { - var nextflowProfile = $('#nextflow-profile').val(); - var nextflowConfig = $('#nextflow-config').val(); - var nextflowWork = $('#nextflow-work').val(); - - application.attr('config').attr('nextflow.profile', nextflowProfile); - application.attr('config').attr('nextflow.config', nextflowConfig); - application.attr('config').attr('nextflow.work', nextflowWork); - application.save(function(data) {}, - function(response) { - showErrorDialog("Operation failed", response); - }); - } - }).find("div.modal-dialog").css({ "width": "80%" }); - - }, - - - '.edit-permission-btn click': function(el, ev) { + '.edit-permission-btn click': function (el, ev) { var card = $(el).closest('.card'); var application = domData.get.call(card[0], 'application'); Group.findAll({}, - function(groups) { + function (groups) { var selection = new canMap(); selection.attr('group', application.attr('permission')); selection.attr('name', ''); bootbox.confirm(templatePermission({ - selection: selection, - application: application, - groups: groups - }), - function(result) { + selection: selection, + application: application, + groups: groups + }), + function (result) { if (result) { var group = selection.attr('group'); if (group !== '') { application.attr('permission', group); - application.save(function(data) {}, - function(response) { + application.save(function (data) { }, + function (response) { showErrorDialog("Operation failed", response); }); } else { var name = selection.attr('name'); if (name !== '') { application.attr('permission', name); - application.save(function(data) {}, - function(response) { + application.save(function (data) { }, + function (response) { showErrorDialog("Operation failed", response); }); @@ -264,35 +235,5 @@ export default Control.extend({ }); }); - }, - - '.reinstall-btn click': function(el, ev) { - - var card = $(el).closest('.card'); - var application = domData.get.call(card[0], 'application'); - bootbox.confirm('Force reinstallation of application?
All metafiles in HDFS are deleted and reimported on next job run.
' + application.attr('filename') + '
' + application.attr('state') + '
' + '' + env + '' + application.attr('source') + '
{{{truncate(wdlApp.description, 200)}}}
- {{wdlApp.website}}
- {{#is(state, 'completed')}}
-
-
- Installation: {{state}}
-
-
- {{/is}}
- {{#is(state, 'on demand')}}
-
-
- Installation: {{state}}
-
- {{/is}}
+ {{wdlApp.website}}
Applications / {{application.id}}
+Change settings for application {{application.wdlApp.name}}.
Custom Configuration:
All hardware specific parameters can be set here. If you use the AWSBatch profile this is the place to set your credentials
${{{{name}}}This page lists all submitted and running jobs.
- {{user.username}}
+ {{username}}
diff --git a/src/main/html/webapp/components/admin/layout/layout.stache b/src/main/html/webapp/components/admin/layout/layout.stache index e86032c7..95d77850 100644 --- a/src/main/html/webapp/components/admin/layout/layout.stache +++ b/src/main/html/webapp/components/admin/layout/layout.stache @@ -28,6 +28,7 @@ Settings diff --git a/src/main/html/webapp/components/admin/settings/general/general.js b/src/main/html/webapp/components/admin/settings/general/general.js index bd4a0078..a9a4d080 100644 --- a/src/main/html/webapp/components/admin/settings/general/general.js +++ b/src/main/html/webapp/components/admin/settings/general/general.js @@ -9,11 +9,11 @@ import showErrorDialog from 'helpers/error-dialog'; export default Control.extend({ - "init": function(element, options) { + "init": function (element, options) { var that = this; Settings.findOne({}, - function(settings) { + function (settings) { $(element).html(template({ settings: settings })); @@ -23,16 +23,21 @@ export default Control.extend({ }, - 'submit': function(form, event) { + 'submit': function (form, event) { event.preventDefault(); this.settings.attr('name', $(form).find("[name='name']").val()); + this.settings.attr('adminName', $(form).find("[name='adminName']").val()); + this.settings.attr('adminMail', $(form).find("[name='adminMail']").val()); + this.settings.attr('serverUrl', $(form).find("[name='serverUrl']").val()); this.settings.attr('backgroundColor', $(form).find("[name='background-color']").val()); this.settings.attr('foregroundColor', $(form).find("[name='foreground-color']").val()); this.settings.attr('googleAnalytics', $(form).find("[name='google-analytics']").val()); - this.settings.save(function(data) { + this.settings.attr('workspaceType', $(form).find("[name='workspaceType']").val()); + this.settings.attr('workspaceLocation', $(form).find("[name='workspaceLocation']").val()); + this.settings.save(function (data) { bootbox.alert("Settings updated."); - }, function(response) { + }, function (response) { showErrorDialog("Settings not updated", response); }); diff --git a/src/main/html/webapp/components/admin/settings/general/general.stache b/src/main/html/webapp/components/admin/settings/general/general.stache index 6b1c01ed..99af7577 100644 --- a/src/main/html/webapp/components/admin/settings/general/general.stache +++ b/src/main/html/webapp/components/admin/settings/general/general.stache @@ -6,11 +6,55 @@