You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2018/04/02 21:55:19 UTC
[GitHub] DaanHoogland closed pull request #2520: make Broadcast- and IsolationURI visible to admin
DaanHoogland closed pull request #2520: make Broadcast- and IsolationURI visible to admin
URL: https://github.com/apache/cloudstack/pull/2520
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index ab075b01f14..84d60033045 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2835,6 +2835,16 @@
}
}
},
+ preFilter: function(args) {
+ var hiddenFields;
+ if (isAdmin()) {
+ hiddenFields = [];
+ } else {
+ hiddenFields = ["broadcasturi", "isolationuri"];
+ }
+
+ return hiddenFields;
+ },
fields: [{
id: {
label: 'label.id'
@@ -2871,7 +2881,12 @@
ip6cidr: {
label: 'label.ipv6.CIDR'
},
-
+ broadcasturi : {
+ label: 'label.broadcast.uri'
+ },
+ isolationuri : {
+ label: 'label.isolation.uri'
+ },
isdefault: {
label: 'label.is.default',
converter: function(data) {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services