You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/16 05:09:13 UTC
[1/3] git commit: updated refs/heads/master to 60fd729
Repository: cloudstack
Updated Branches:
refs/heads/master 9d8eebf68 -> 60fd7292d
CLOUDSTACK-9655 The template which is registered in all zones will be
deleted by deleting 1 template on any zone
added extra warning message if it's a cross-zone template ("This is a
cross zone template and will be deleted from all the zones. Are you sure
you want to proceed?").
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f124b27
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f124b27
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f124b27
Branch: refs/heads/master
Commit: 4f124b2775d266bb36f8d90d88518f6b8db0b858
Parents: 01e78f9
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Tue Dec 6 16:25:01 2016 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Mon Feb 13 16:42:08 2017 +0530
----------------------------------------------------------------------
ui/scripts/templates.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f124b27/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 96ef43a..ce78564 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -1447,7 +1447,11 @@
label: 'label.action.delete.template',
messages: {
confirm: function(args) {
- return 'message.action.delete.template';
+ if(args.context.templates[0].crossZones == true) {
+ return 'message.action.delete.template.for.all.zones';
+ } else {
+ return 'message.action.delete.template';
+ }
},
notification: function(args) {
return 'label.action.delete.template';
[3/3] git commit: updated refs/heads/master to 60fd729
Posted by ra...@apache.org.
Merge release branch 4.9 to master
* 4.9:
CLOUDSTACK-9655 The template which is registered in all zones will be deleted by deleting 1 template on any zone
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/60fd7292
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/60fd7292
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/60fd7292
Branch: refs/heads/master
Commit: 60fd7292da024a34846c4f3eed26455f3422c259
Parents: 9d8eebf 6dced70
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Thu Feb 16 10:39:12 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Thu Feb 16 10:39:12 2017 +0530
----------------------------------------------------------------------
ui/scripts/templates.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60fd7292/ui/scripts/templates.js
----------------------------------------------------------------------
diff --cc ui/scripts/templates.js
index 26f0fd1,ce78564..5d52dfd
mode 100755,100644..100755
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
[2/3] git commit: updated refs/heads/master to 60fd729
Posted by ra...@apache.org.
Merge pull request #1818 from Accelerite/CLOUDSTACK-9655
CLOUDSTACK-9655 The template which is registered in all zones will be deleted by deleting 1 template on any zoneadded extra warning message if it's a cross-zone template ("This is a
cross zone template and will be deleted from all the zones. Are you sure
you want to proceed?").
* pr/1818:
CLOUDSTACK-9655 The template which is registered in all zones will be deleted by deleting 1 template on any zone
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6dced70a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6dced70a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6dced70a
Branch: refs/heads/master
Commit: 6dced70aa8ec81c79b824e2e23184c4105fdf5a2
Parents: abd7860 4f124b2
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Thu Feb 16 10:38:35 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Thu Feb 16 10:38:35 2017 +0530
----------------------------------------------------------------------
ui/scripts/templates.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------