Author: sshyrkov Date: Thu Nov 15 12:07:10 2007 New Revision: 19157 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19157&repname= =3Djahia Log: JAHIA-2603: Do not display "Enforce Password Policy" checkbox in Standard a= nd Community editions =
http://www.jahia.net/jira/browse/JAHIA-2603 Resolution: check added Modified: trunk/core/src/webapp/jsp/jahia/administration/group_management/group_e= dit.jsp trunk/core/src/webapp/jsp/jahia/administration/site_add.jsp trunk/core/src/webapp/jsp/jahia/administration/site_edit.jsp trunk/core/src/webapp/jsp/jahia/administration/sites_management.jsp Modified: trunk/core/src/webapp/jsp/jahia/administration/group_management/g= roup_edit.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/administration/group_management/group_edit.jsp&rev=3D19157&repna= me=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/administration/group_management/group_e= dit.jsp (original) +++ trunk/core/src/webapp/jsp/jahia/administration/group_management/group_e= dit.jsp Thu Nov 15 12:07:10 2007 @@ -22,6 +22,8 @@ <[EMAIL PROTECTED] import =3D "org.jahia.services.pages.*"%> <[EMAIL PROTECTED] import=3D"org.jahia.data.viewhelper.principal.PrincipalViewHelper"= %> <[EMAIL PROTECTED] import=3D"org.jahia.params.ParamBean"%> +<[EMAIL PROTECTED] import=3D"org.jahia.registries.ServicesRegistry"%> +<[EMAIL PROTECTED] import=3D"org.jahia.services.acl.JahiaBaseACL"%> <[EMAIL PROTECTED] uri=3D"JahiaLib" prefix=3D"jahia" %> <[EMAIL PROTECTED] import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%> <%@ taglib prefix=3D"c" uri=3D"/WEB-INF/etc/taglibs/jstl/c.tld" %> @@ -140,6 +142,7 @@ </div> </td> </tr> + <% if (ServicesRegistry.getInstance().getJahiaACLManagerService().= getServerActionPermission("admin.pwdpolicy.ManagePasswordPolicies", jParams= .getUser(), JahiaBaseACL.READ_RIGHTS, jParams.getSiteID()) > 0) { %> <tr> <td align=3D"right"> <jahia:adminResourceBundle resourceName=3D"org.jahia.admin= .site.ManageSites.enforcePasswordPolicy.label"/> @@ -150,6 +153,7 @@ <c:if test=3D"${empty enforcePasswordPolicy}">disabled= =3D"disabled"</c:if>/> </td> </tr> + <% } %> </table> <br> <table class=3D"text" border=3D"0" cellspacing=3D"0" cellpadding=3D"0"= align=3D"center"> Modified: trunk/core/src/webapp/jsp/jahia/administration/site_add.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/administration/site_add.jsp&rev=3D19157&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/administration/site_add.jsp (original) +++ trunk/core/src/webapp/jsp/jahia/administration/site_add.jsp Thu Nov 15 = 12:07:10 2007 @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and = limitations under the License. --%><[EMAIL PROTECTED] import=3D"org.jahia.bin.JahiaAdministration"%> +<[EMAIL PROTECTED] import=3D"org.jahia.params.ParamBean"%> +<[EMAIL PROTECTED] import=3D"org.jahia.registries.ServicesRegistry"%> +<[EMAIL PROTECTED] import=3D"org.jahia.services.acl.JahiaBaseACL"%> <[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%> <%@ taglib prefix=3D"c" uri=3D"/WEB-INF/etc/taglibs/jstl/c.tld" %> <% @@ -23,6 +26,7 @@ * @version $Id$ */ = + final ParamBean jParams =3D (ParamBean) request.getAttribute("org.ja= hia.params.ParamBean" ); String warningMsg =3D (String)request.getAttribute("warningMsg"); JahiaSite newJahiaSite =3D (JahiaSite)request.getAttribute("newJahiaSi= te"); Boolean defaultSite =3D (Boolean)request.getAttribute("defaultSite= "); @@ -83,6 +87,7 @@ = </td> </tr> + <% if (ServicesRegistry.getInstance().getJahiaACLManagerService().ge= tServerActionPermission("admin.pwdpolicy.ManagePasswordPolicies", jParams.g= etUser(), JahiaBaseACL.READ_RIGHTS, jParams.getSiteID()) > 0) { %> <tr> <td> <label for=3D"enforcePasswordPolicy"> @@ -93,6 +98,7 @@ : <input class=3D"input" type=3D"checkbox" name=3D"en= forcePasswordPolicy" value=3D"true" <c:if test=3D"${enforcePasswordPolicy}"= >checked=3D"checked"</c:if> id=3D"enforcePasswordPolicy"/> </td> </tr> + <% } %> <tr > <td> <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.s= ite.ManageSites.siteDesc.label"/> Modified: trunk/core/src/webapp/jsp/jahia/administration/site_edit.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/administration/site_edit.jsp&rev=3D19157&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/administration/site_edit.jsp (original) +++ trunk/core/src/webapp/jsp/jahia/administration/site_edit.jsp Thu Nov 15= 12:07:10 2007 @@ -15,10 +15,14 @@ See the License for the specific language governing permissions and = limitations under the License. --%> +<[EMAIL PROTECTED] import=3D"org.jahia.params.ParamBean"%> +<[EMAIL PROTECTED] import=3D"org.jahia.registries.ServicesRegistry"%> +<[EMAIL PROTECTED] import=3D"org.jahia.services.acl.JahiaBaseACL"%> <[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%> <%@ taglib prefix=3D"c" uri=3D"/WEB-INF/etc/taglibs/jstl/c.tld" %> = <% + final ParamBean jParams =3D (ParamBean) request.getAttribute("org.ja= hia.params.ParamBean" ); String warningMsg =3D (String)request.getAttribute("warningMsg"); String siteTitle =3D (String)request.getAttribute("siteTitle"); String siteServerName =3D (String)request.getAttribute("siteServerNam= e"); @@ -98,6 +102,7 @@ <% } %> </td> </tr> + <% if (ServicesRegistry.getInstance().getJahiaACLManagerService().getS= erverActionPermission("admin.pwdpolicy.ManagePasswordPolicies", jParams.get= User(), JahiaBaseACL.READ_RIGHTS, jParams.getSiteID()) > 0) { %> <tr> <td> <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit= e.ManageSites.enforcePasswordPolicy.label"/> @@ -106,6 +111,7 @@ : <input class=3D"input" type=3D"checkbox" name=3D"enforc= ePasswordPolicy" value=3D"true" <c:if test=3D"${enforcePasswordPolicy}">che= cked=3D"checked"</c:if>/> </td> </tr> + <% } %> <% /* <!-- temporarily deactivated because this is not yet fully functional = in the back-end --> <!-- Modified: trunk/core/src/webapp/jsp/jahia/administration/sites_management.j= sp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/administration/sites_management.jsp&rev=3D19157&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/administration/sites_management.jsp (or= iginal) +++ trunk/core/src/webapp/jsp/jahia/administration/sites_management.jsp Thu= Nov 15 12:07:10 2007 @@ -22,6 +22,8 @@ <%@ page import=3D"java.text.DateFormat" %> <%@ page import=3D"java.text.SimpleDateFormat" %> <%@ page import=3D"java.util.Date" %> +<[EMAIL PROTECTED] import=3D"org.jahia.registries.ServicesRegistry"%> +<[EMAIL PROTECTED] import=3D"org.jahia.services.acl.JahiaBaseACL"%> <%@ taglib prefix=3D"c" uri=3D"/WEB-INF/etc/taglibs/jstl/c.tld" %> = <% @@ -170,6 +172,7 @@ = </td> </tr> + <% if (ServicesRegistry.getInstance().getJahiaACLManagerService().ge= tServerActionPermission("admin.pwdpolicy.ManagePasswordPolicies", jParams.g= etUser(), JahiaBaseACL.READ_RIGHTS, newJahiaSite.getID()) > 0) { %> <tr> <td> <jahia:adminResourceBundle resourceName=3D"org.jahia.admin= .site.ManageSites.enforcePasswordPolicy.label"/> @@ -178,6 +181,7 @@ : <input class=3D"input" type=3D"checkbox" name=3D"en= forcePasswordPolicy" value=3D"true" <c:if test=3D"${enforcePasswordPolicy}"= >checked=3D"checked"</c:if>/> </td> </tr> + <% } %> <tr > <td> <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.s= ite.ManageSites.siteDesc.label"/> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
