You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/12/18 12:56:44 UTC
[24/40] git commit: updated refs/heads/master to f4133a7
CLOUDSTACK-8076: UI > Templates menu > Template/ISO > "Filter by" dropdown > add a new option, "shared", which will list shared templates when being selected.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a8dcf5f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a8dcf5f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a8dcf5f
Branch: refs/heads/master
Commit: 6a8dcf5f204d51541b77d363567ad045b22071ae
Parents: 66b7738
Author: Jessica Wang <je...@apache.org>
Authored: Tue Dec 16 14:38:50 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Tue Dec 16 14:38:50 2014 -0800
----------------------------------------------------------------------
ui/scripts/templates.js | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a8dcf5f/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 1ca3214..dc0f055 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -43,6 +43,9 @@
mine: {
label: 'ui.listView.filters.mine'
},
+ shared: {
+ label: 'Shared'
+ },
featured: {
label: 'label.featured'
},
@@ -589,6 +592,11 @@
templatefilter: 'self'
});
break;
+ case "shared":
+ $.extend(data, {
+ templatefilter: 'shared'
+ });
+ break;
case "featured":
ignoreProject = true;
$.extend(data, {
@@ -1452,6 +1460,9 @@
mine: {
label: 'ui.listView.filters.mine'
},
+ shared: {
+ label: 'Shared'
+ },
featured: {
label: 'label.featured'
},
@@ -1717,6 +1728,11 @@
isofilter: 'self'
});
break;
+ case "shared":
+ $.extend(data, {
+ isofilter: 'shared'
+ });
+ break;
case "featured":
ignoreProject = true;
$.extend(data, {