Repository: stratos Updated Branches: refs/heads/master 55b0ac401 -> 35462838e
change groups to cartridgegroups in UI Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/35462838 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/35462838 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/35462838 Branch: refs/heads/master Commit: 35462838e64abae40d275782c940b063df559e86 Parents: 55b0ac4 Author: Dakshika Jayathilaka <[email protected]> Authored: Tue May 19 19:01:12 2015 +0530 Committer: Dakshika Jayathilaka <[email protected]> Committed: Tue May 19 19:01:58 2015 +0530 ---------------------------------------------------------------------- .../console/configure_form.jag | 6 +-- .../configure/configure_requests.jag | 6 +-- .../default/configure/cartridgegroups.json | 9 ++++ .../forms/default/configure/groups.json | 9 ---- .../forms/schema/configure/cartridgegroups.json | 46 ++++++++++++++++++++ .../forms/schema/configure/groups.json | 46 -------------------- .../console/controllers/menu/menu.json | 2 +- .../js/custom/applications_group_editor.js | 2 +- .../themes/theme0/partials/configure_form.hbs | 10 ++--- 9 files changed, 68 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/35462838/components/org.apache.stratos.manager.console/console/configure_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag index de828fd..00a760e 100644 --- a/components/org.apache.stratos.manager.console/console/configure_form.jag +++ b/components/org.apache.stratos.manager.console/console/configure_form.jag @@ -71,7 +71,7 @@ if (!elements) { error.push({"errorMessage": e.message}); } - if (elements.formtype == 'groups' && elements.action == 'new') { + if (elements.formtype == 'cartridgegroups' && elements.action == 'new') { applicationHbs = 'applicationsGroupEditor'; editorCartridges = util.RESTCalls.getCartridges(); } @@ -120,7 +120,7 @@ if(isEdit == false && elements.action != 'new') { } break; - case "groups": + case "cartridgegroups": formTitle = "Cartridge Group Definition", buttonText = "Cartridge Group Definition"; list_data = util.RESTCalls.getGroups(); @@ -182,7 +182,7 @@ if (elements.action != 'new' && isEdit) { formDataEdit = util.RESTCalls.getCartridge(id); break; - case "groups": + case "cartridgegroups": formDataEdit = util.RESTCalls.getPolicyCartridgeGroup(id); break; http://git-wip-us.apache.org/repos/asf/stratos/blob/35462838/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag index c5b6387..5756ecc 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag @@ -42,7 +42,7 @@ try { case "cartridges": formSubmit = util.RESTCalls.deployCartridgeDefinition(formPayload); break; - case "groups": + case "cartridgegroups": formSubmit = util.RESTCalls.deployGroupDefinition(formPayload); break; case "docker": @@ -51,10 +51,10 @@ try { case "applicationpolicies": formSubmit = util.RESTCalls.deployApplicationPolicyDefinition(formPayload); break; - case "update-groups": + case "update-cartridgegroups": formSubmit = util.RESTCalls.updateGroupDefinition(formPayload); break; - case "delete-groups": + case "delete-cartridgegroups": formSubmit = util.RESTCalls.deleteGroup(formPayload); break; case "delete-applicationpolicies": http://git-wip-us.apache.org/repos/asf/stratos/blob/35462838/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridgegroups.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridgegroups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridgegroups.json new file mode 100644 index 0000000..4156f39 --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridgegroups.json @@ -0,0 +1,9 @@ +{ + "name": "group1", + "cartridges": [ + "tomcat" + ], + "dependencies": { + "terminationBehaviour": "terminate-none" + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/35462838/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/groups.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/groups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/groups.json deleted file mode 100644 index 4156f39..0000000 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/groups.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "group1", - "cartridges": [ - "tomcat" - ], - "dependencies": { - "terminationBehaviour": "terminate-none" - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/35462838/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridgegroups.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridgegroups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridgegroups.json new file mode 100644 index 0000000..a97c609 --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridgegroups.json @@ -0,0 +1,46 @@ +{ + "type":"object", + "$schema": "http://json-schema.org/draft-04/schema";, + "id": "root", + "title": "Cartridge Group Definition", + "name": "Cartridge Group", + "options": { + "disable_properties": true, + "disable_collapse": true + }, + "properties":{ + "cartridges": { + "type":"array", + "id": "root/cartridges", + "required":false, + "items": + { + "type":"string", + "id": "root/cartridges/0", + "default": "tomcat", + "required":false + } + + + }, + "dependencies": { + "type":"object", + "id": "root/dependencies", + "required":false, + "properties":{ + "terminationBehaviour": { + "type":"string", + "id": "root/dependencies/terminationBehaviour", + "default": "terminate-none", + "required":false + } + } + }, + "name": { + "type":"string", + "id": "root/name", + "default": "group1", + "required":false + } + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/35462838/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/groups.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/groups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/groups.json deleted file mode 100644 index a97c609..0000000 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/groups.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "type":"object", - "$schema": "http://json-schema.org/draft-04/schema";, - "id": "root", - "title": "Cartridge Group Definition", - "name": "Cartridge Group", - "options": { - "disable_properties": true, - "disable_collapse": true - }, - "properties":{ - "cartridges": { - "type":"array", - "id": "root/cartridges", - "required":false, - "items": - { - "type":"string", - "id": "root/cartridges/0", - "default": "tomcat", - "required":false - } - - - }, - "dependencies": { - "type":"object", - "id": "root/dependencies", - "required":false, - "properties":{ - "terminationBehaviour": { - "type":"string", - "id": "root/dependencies/terminationBehaviour", - "default": "terminate-none", - "required":false - } - } - }, - "name": { - "type":"string", - "id": "root/name", - "default": "group1", - "required":false - } - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/35462838/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json index 72e2a65..64c29f8 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json +++ b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json @@ -55,7 +55,7 @@ "description": "Manage single-tenant & multi-tenant cartridges." }, { - "link": "configure/groups/", + "link": "configure/cartridgegroups/", "linkexternal": false, "context": "/configure", "title": "Cartridge Groups", http://git-wip-us.apache.org/repos/asf/stratos/blob/35462838/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js index 2dd5721..4f3712d 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js @@ -424,7 +424,7 @@ $(document).ready(function(){ $('#deploy').on('click', function(){ var payload = genGroupJSON({}, jsPlumb.getConnections()); var btn = $(this); - var formtype = 'groups'; + var formtype = 'cartridgegroups'; btn.html("<i class='fa fa-spinner fa-spin'></i> Adding..."); $.ajax({ type: "POST", http://git-wip-us.apache.org/repos/asf/stratos/blob/35462838/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs index 53eadcf..9cbdea5 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs @@ -348,7 +348,7 @@ </div> {{/each}} {{/ifCond}} - {{#ifCond formtype "==" "groups"}} + {{#ifCond formtype "==" "cartridgegroups"}} {{#each content_body.sections}} <div class="block col-md-4 grid-group-item border-right"> <div class="toggle-menu-icon"> @@ -359,17 +359,17 @@ <div class="toggle-menu-description">{{description}} </div> <div class="list-button" style="display: none;"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{name}}" data-formtype="delete-groups"> Delete</button> + id="{{name}}" data-formtype="delete-cartridgegroups"> Delete</button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{name}}" - data-url="{{url ""}}/configure/groups/{{name}}/" > Details + data-url="{{url ""}}/configure/cartridgegroups/{{name}}/" > Details </button> </div> <div class="bottom-bar-wrapper"> <div class="bottom-bar"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{name}}" data-formtype="delete-groups"> Delete</button> + id="{{name}}" data-formtype="delete-cartridgegroups"> Delete</button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{name}}" - data-url="{{url ""}}/configure/groups/{{name}}/" > Details + data-url="{{url ""}}/configure/cartridgegroups/{{name}}/" > Details </button> </div> </div>
