You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/19 13:59:29 UTC

[3/6] stratos git commit: adding cartridge-groups update support

adding cartridge-groups update support


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/df510546
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/df510546
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/df510546

Branch: refs/heads/master
Commit: df5105466e3b240e94a337b8b0b4774de356b4e8
Parents: d9f0d06
Author: reka <rt...@gmail.com>
Authored: Mon May 18 15:27:28 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Tue May 19 17:29:15 2015 +0530

----------------------------------------------------------------------
 .../console/controllers/configure/configure_requests.jag       | 5 ++++-
 .../console/controllers/rest/rest_calls.jag                    | 4 ++++
 .../console/themes/theme0/partials/configure_form.hbs          | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/df510546/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 1982fe8..14835cc 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
@@ -51,9 +51,12 @@ try {
         case "applicationpolicies":
             formSubmit = util.RESTCalls.deployApplicationPolicyDefinition(formPayload);
             break;
-        case "delete-groups":
+        case "update-groups":
             formSubmit = util.RESTCalls.deleteGroup(formPayload);
             break;
+        case "delete-groups":
+            formSubmit = util.RESTCalls.updateGroupDefinition(formPayload);
+            break;
         case "delete-applicationpolicies":
             formSubmit = util.RESTCalls.deleteApplicationPolicyDefinition(formPayload);
             break;

http://git-wip-us.apache.org/repos/asf/stratos/blob/df510546/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
index 26b3a22..8d4dea5 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
@@ -108,6 +108,10 @@ RESTCalls = new function(){
         return this.send("POST","/cartridgeGroups", groupDefinition);
     };
 
+    this.updateGroupDefinition = function(groupDefinition){
+        return this.send("PUT","/cartridgeGroups", groupDefinition);
+    };
+
     this.deployApplicationDefinition = function(applicationDefinition){
         return this.send("POST","/applications", applicationDefinition);
     };

http://git-wip-us.apache.org/repos/asf/stratos/blob/df510546/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 42757d2..f18ca84 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
@@ -354,6 +354,9 @@
                     <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>
+                        <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{name}}"
+                                data-url="{{url ""}}/configure/groups/{{name}}/edit" > Edit
+                        </button>
                         <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{name}}"
                                 data-url="{{url ""}}/configure/groups/{{name}}/" > Details
                         </button>
@@ -362,6 +365,9 @@
                         <div class="bottom-bar">
                             <button class="btn btn-danger btn-lg hover-delete" type="button"
                                     id="{{name}}" data-formtype="delete-groups"> Delete</button>
+                            <button class="btn btn-warning btn-lg hover-details" type="button" id="details_{{name}}"
+                                    data-url="{{url ""}}/configure/groups/{{name}}/edit" > Edit
+                            </button>
                             <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{name}}"
                                     data-url="{{url ""}}/configure/groups/{{name}}/" > Details
                             </button>