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 2014/02/17 14:57:42 UTC

git commit: imprving the UI to support multiple volumes

Repository: incubator-stratos
Updated Branches:
  refs/heads/master 721dd0c17 -> 0bb15d182


imprving the UI to support multiple volumes


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

Branch: refs/heads/master
Commit: 0bb15d182fabc44588fbf0bc9938c29ac34f196d
Parents: 721dd0c
Author: rekathiru <rt...@gmail.com>
Authored: Mon Feb 17 19:27:27 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Mon Feb 17 19:27:27 2014 +0530

----------------------------------------------------------------------
 .../console/controllers/cartridgeSubscribeSubmit.jag  |  4 +---
 .../themes/theme1/partials/subscribe_cartridge.hbs    | 14 +++-----------
 2 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0bb15d18/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag
index 0c9c2be..88844ec 100755
--- a/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag
@@ -12,9 +12,8 @@
     var repoPassword = request.getParameter('repoPassword');
     var autoscalePolicy = request.getParameter('autoscalePolicy');
     var deploymentPolicy = request.getParameter('deploymentPolicy');
-    var device = request.getParameter('device');
     var size = request.getParameter('size');
-    var removeontermination = request.getParameter('removeontermination');
+    var removeontermination = request.getParameter('removeOnUnsubscription');
     var persistencerequired = request.getParameter('persistencerequired');
 
 
@@ -31,7 +30,6 @@
     jsonRequest.cartridgeInfoBean.autoscalePolicy = autoscalePolicy;
     jsonRequest.cartridgeInfoBean.deploymentPolicy = deploymentPolicy;
     jsonRequest.cartridgeInfoBean.size = size;
-    jsonRequest.cartridgeInfoBean.device = device;
     jsonRequest.cartridgeInfoBean.persistanceRequired = persistencerequired;
     jsonRequest.cartridgeInfoBean.removeOnTermination = removeontermination;
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0bb15d18/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
index 6ff311f..29b7e40 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
@@ -25,32 +25,24 @@
                 </div>
             </div>
             {{#ifCond cartridge.provider "==" "data"}}
-                {{#if cartridge.persistance}}
+                {{#if cartridge.persistence.persistanceRequired}}
                     <label class="required">Persistence Storage:</label>
                         <label>
                             <input name="persistencerequired" type="checkbox" id="volume_check"/> Require Persistence storage
                         </label>
                     <div id="persistence_container" style="display: none;padding-left:20px;margin-left:20px; background: #efefef;padding-bottom:10px;margin-bottom:10px;">
                         <h2>Persistence Mappings</h2>
-                        {{#each cartridge.persistanceBeans}}
-                            <div class="form-group">
-                                <label class="required">device:</label>
-                                <div class="form-inline">
-                                    <input name="device" class="form-control input-xlarge" value={{device}}/>
-                                </div>
-                            </div>
                             <div class="form-group">
                                 <label class="required">Size:</label>
                                 <div class="form-inline">
-                                    <input name="size" class="form-control input-xlarge" value={{size}}/>
+                                    <input name="size" class="form-control input-xlarge" placeholder="10"/>
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label>
-                                    <input name="removeontermination" type="checkbox" {{#if removeOntermination}}checked="checked"{{/if}} id="volume_check" />Remove on termination
+                                    <input name="removeOnUnsubscription" type="checkbox" id="volume_check" />Remove On Unsubscription
                                 </label>
                             </div>
-                        {{/each}}
                     </div>