cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject git commit: updated refs/heads/ui-vpc-redesign to e6382b1
Date Tue, 21 May 2013 17:00:43 GMT
Updated Branches:
  refs/heads/ui-vpc-redesign e5e41b0f4 -> e6382b189


Delete ACL list filter and css


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

Branch: refs/heads/ui-vpc-redesign
Commit: e6382b1896692e4e76afa7f7a7f7a2c304958006
Parents: e5e41b0
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Tue May 21 22:15:15 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Tue May 21 22:15:15 2013 +0530

----------------------------------------------------------------------
 ui/css/cloudstack3.css |    6 ++++--
 ui/scripts/vpc.js      |   11 ++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6382b18/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 549db37..1658453 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -11736,13 +11736,15 @@ div.ui-dialog div.autoscaler div.field-group div.form-container
form div.form-it
 .destroy .icon,
 .remove .icon,
 .delete .icon,
-.decline .icon {
+.decline .icon,
+.deleteacllist .icon {
   background-position: 1px -92px;
 }
 
 .destroy:hover .icon,
 .remove:hover .icon,
-.delete:hover .icon {
+.delete:hover .icon,
+.deleteacllist:hover .icon {
   background-position: 1px -674px;
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6382b18/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 2c95420..fa5c0a5 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -663,7 +663,16 @@
                 dataProvider: function(args) {
                      var items = args.context.aclLists[0];
                      args.response.success({
-                        data: items
+                        data: items,
+                         actionFilter: function(args) {
+                            var allowedActions = [];
+                            if(isAdmin()) {
+                              allowedActions.push("deleteacllist");
+
+                            }
+                            return allowedActions;
+                          }
+
 
                     });
                 }


Mime
View raw message