java/code/webapp/WEB-INF/nav/system_detail.xml | 2 +-
web/html/nav/system_detail.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 170fd91e08fa47c10512c7e754a51ae5cd4b07ee
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 16:32:29 2011 +0200
678118 - if system already is proxy, losen the ACL and show the tab.
diff --git a/java/code/webapp/WEB-INF/nav/system_detail.xml
b/java/code/webapp/WEB-INF/nav/system_detail.xml
index 3faac54..2382277 100644
--- a/java/code/webapp/WEB-INF/nav/system_detail.xml
+++ b/java/code/webapp/WEB-INF/nav/system_detail.xml
@@ -8,7 +8,7 @@
<rhn-tab-url>/network/systems/details/remote_commands.pxt</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Connection"
url="/network/systems/details/connection.pxt"
acl="org_has_proxies()"/>
- <rhn-tab name="Proxy" url="/network/systems/details/proxy.pxt"
acl="user_role(org_admin); system_feature(ftr_proxy_capable);
org_channel_family(rhn-proxy); child_channel_candidate(rhn-proxy); not
system_is_satellite(); not is_solaris();system_feature(ftr_kickstart) or
system_feature(ftr_snapshotting)">
+ <rhn-tab name="Proxy" url="/network/systems/details/proxy.pxt"
acl="user_role(org_admin); system_feature(ftr_proxy_capable) or system_is_proxy();
org_channel_family(rhn-proxy) or system_is_proxy(); child_channel_candidate(rhn-proxy) or
system_is_proxy(); not system_is_satellite(); not
is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)">
<rhn-tab name="Activation"
url="/network/systems/details/proxy.pxt" />
<rhn-tab name="Systems Using Proxy"
url="/network/systems/details/proxy-clients.pxt" acl="system_is_proxy()
"/>
</rhn-tab>
diff --git a/web/html/nav/system_detail.xml b/web/html/nav/system_detail.xml
index 4ef88da..ccb3bbc 100644
--- a/web/html/nav/system_detail.xml
+++ b/web/html/nav/system_detail.xml
@@ -8,7 +8,7 @@
<rhn-tab-url>/network/systems/details/remote_commands.pxt</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Connection"
url="/network/systems/details/connection.pxt"
acl="org_has_proxies()"/>
- <rhn-tab name="Proxy" url="/network/systems/details/proxy.pxt"
acl="user_role(org_admin); system_feature(ftr_proxy_capable);
org_channel_family(rhn-proxy); child_channel_candidate(rhn-proxy);
org_entitlement(rhn_provisioning); not system_is_satellite(); not
is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)">
+ <rhn-tab name="Proxy" url="/network/systems/details/proxy.pxt"
acl="user_role(org_admin); system_feature(ftr_proxy_capable) or system_is_proxy();
org_channel_family(rhn-proxy) or system_is_proxy(); child_channel_candidate(rhn-proxy) or
system_is_proxy(); org_entitlement(rhn_provisioning); not system_is_satellite(); not
is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)">
<rhn-tab name="Activation"
url="/network/systems/details/proxy.pxt" />
<rhn-tab name="Systems Using Proxy"
url="/network/systems/details/proxy-clients.pxt"
acl="system_is_proxy()"/>
</rhn-tab>