java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 104 ++++++++++-------------- 1 file changed, 47 insertions(+), 57 deletions(-)
New commits: commit 737f8e17793544df64b27410d35150ec2a50d308 Author: Silvio Moioli smoioli@suse.de Date: Tue Dec 3 15:41:08 2013 +0100
ssmindex.jsp: remove incorrect acls
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index d3f75ec..e0b8100 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -23,61 +23,59 @@ <div class="panel-body"> <bean:message key="ssm.overview.systems.list"/> </div> - <rhn:require acl="no_bootstrap_systems_in_set()"> + <div class="panel-heading"> + <i class="fa spacewalk-icon-patches fa-fw" title="Errata"></i> + <bean:message key="ssm.overview.errata"/> + </div> + <div class="panel-body"> + <bean:message key="ssm.overview.errata.schedule"/> + </div> + <div class="panel-heading"> + <i class="fa spacewalk-icon-packages fa-fw" title="<bean:message key='ssm.overview.packages'/>"></i> + <bean:message key="ssm.overview.packages"/> + </div> + <div class="panel-body"> + <bean:message key="ssm.overview.packages.upgrade"/> + </div> + <rhn:require acl="is(enable_solaris_support)"> <div class="panel-heading"> - <i class="fa spacewalk-icon-patches fa-fw" title="Errata"></i> - <bean:message key="ssm.overview.errata"/> + <i class="fa spacewalk-icon-patches fa-fw" title="<bean:message key='ssm.overview.patches'/>"></i> + <bean:message key="ssm.overview.patches"/> </div> <div class="panel-body"> - <bean:message key="ssm.overview.errata.schedule"/> + <a href="/network/systems/ssm/patches/install.pxt"><bean:message key="ssm.overview.patches.install"/></a> / <a href="/network/systems/ssm/patches/remove.pxt"><bean:message key="ssm.overview.patches.remove"/></a> + <bean:message key="ssm.overview.patches.patches"/> </div> <div class="panel-heading"> - <i class="fa spacewalk-icon-packages fa-fw" title="<bean:message key='ssm.overview.packages'/>"></i> - <bean:message key="ssm.overview.packages"/> + <i class="fa spacewalk-icon-patch-set fa-fw" title="<bean:message key='ssm.overview.patch.clusters'/>"></i> + <bean:message key="ssm.overview.patch.clusters"/> </div> <div class="panel-body"> - <bean:message key="ssm.overview.packages.upgrade"/> + <bean:message key="ssm.overview.patch.clusters.install"/> </div> - <rhn:require acl="is(enable_solaris_support)"> - <div class="panel-heading"> - <i class="fa spacewalk-icon-patches fa-fw" title="<bean:message key='ssm.overview.patches'/>"></i> - <bean:message key="ssm.overview.patches"/> - </div> - <div class="panel-body"> - <a href="/network/systems/ssm/patches/install.pxt"><bean:message key="ssm.overview.patches.install"/></a> / <a href="/network/systems/ssm/patches/remove.pxt"><bean:message key="ssm.overview.patches.remove"/></a> - <bean:message key="ssm.overview.patches.patches"/> - </div> - <div class="panel-heading"> - <i class="fa spacewalk-icon-patch-set fa-fw" title="<bean:message key='ssm.overview.patch.clusters'/>"></i> - <bean:message key="ssm.overview.patch.clusters"/> - </div> - <div class="panel-body"> - <bean:message key="ssm.overview.patch.clusters.install"/> - </div> - </rhn:require> - <rhn:require acl="user_role(org_admin)"> - <div class="panel-heading"> - <i class="fa spacewalk-icon-system-groups fa-fw" title="<bean:message key='ssm.overview.groups'/>"></i> - <bean:message key="ssm.overview.groups"/> - </div> - <div class="panel-body"> - <bean:message key="ssm.overview.groups.create"/> - </div> - </rhn:require> + </rhn:require> + <rhn:require acl="user_role(org_admin)"> <div class="panel-heading"> - <i class="fa spacewalk-icon-software-channels fa-fw" title="<bean:message key='ssm.overview.channels'/>"></i> - <bean:message key="ssm.overview.channels"/> + <i class="fa spacewalk-icon-system-groups fa-fw" title="<bean:message key='ssm.overview.groups'/>"></i> + <bean:message key="ssm.overview.groups"/> </div> <div class="panel-body"> - <ul> - <li><bean:message key="ssm.overview.channels.memberships"/></li> - <rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> - <li><bean:message key="ssm.overview.channels.subscriptions"/></li> - <li><bean:message key="ssm.overview.channels.deploy"/></li> - </rhn:require> - </ul> + <bean:message key="ssm.overview.groups.create"/> </div> </rhn:require> + <div class="panel-heading"> + <i class="fa spacewalk-icon-software-channels fa-fw" title="<bean:message key='ssm.overview.channels'/>"></i> + <bean:message key="ssm.overview.channels"/> + </div> + <div class="panel-body"> + <ul> + <li><bean:message key="ssm.overview.channels.memberships"/></li> + <rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> + <li><bean:message key="ssm.overview.channels.subscriptions"/></li> + <li><bean:message key="ssm.overview.channels.deploy"/></li> + </rhn:require> + </ul> + </div> <rhn:require acl="org_entitlement(rhn_provisioning);"> <div class="panel-heading"> <i class="fa fa-rocket fa-fw" title="<bean:message key='ssm.overview.provisioning'/>"></i> @@ -86,10 +84,8 @@ <div class="panel-body"> <ul> <li><bean:message key="ssm.overview.provisioning.kickstart"/></li> - <rhn:require acl="no_bootstrap_systems_in_set()"> - <li><bean:message key="ssm.overview.provisioning.rollback"/></li> - <li><bean:message key="ssm.overview.provisioning.remotecommands"/></li> - </rhn:require> + <li><bean:message key="ssm.overview.provisioning.rollback"/></li> + <li><bean:message key="ssm.overview.provisioning.remotecommands"/></li> <li><bean:message key="ssm.overview.provisioning.powermanagement.configure"/></li> <li><bean:message key="ssm.overview.provisioning.powermanagement.operations"/></li> </ul> @@ -101,23 +97,17 @@ </div> <div class="panel-body"> <ul> - <rhn:require acl="no_bootstrap_systems_in_set()"> - <li><bean:message key="ssm.overview.misc.updateprofiles"/></li> - </rhn:require> - <rhn:require acl="org_entitlement(rhn_provisioning); no_bootstrap_systems_in_set()"> + <li><bean:message key="ssm.overview.misc.updateprofiles"/></li> + <rhn:require acl="org_entitlement(rhn_provisioning)"> <li><bean:message key="ssm.overview.misc.customvalues"/></li> </rhn:require> - <rhn:require acl="user_role(org_admin);org_entitlement(rhn_provisioning) or org_entitlement(rhn_monitor); no_bootstrap_systems_in_set()"> + <rhn:require acl="user_role(org_admin);org_entitlement(rhn_provisioning) or org_entitlement(rhn_monitor)"> <li><bean:message key="ssm.overview.misc.entitlements"/></li> </rhn:require> <li><bean:message key="ssm.overview.misc.delete"/></li> - <rhn:require acl="no_bootstrap_systems_in_set()"> - <li><bean:message key="ssm.overview.misc.reboot"/></li> - </rhn:require> + <li><bean:message key="ssm.overview.misc.reboot"/></li> <li><bean:message key="ssm.overview.misc.migrate"/></li> - <rhn:require acl="no_bootstrap_systems_in_set()"> - <li><bean:message key="ssm.overview.misc.scap"/></li> - </rhn:require> + <li><bean:message key="ssm.overview.misc.scap"/></li> </ul> </div> </div>