Author: ktlili
Date: Sun Nov 25 20:25:15 2007
New Revision: 19281
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19281&repname=
=3Djahia
Log:
- commit portlets categories( admin view ): jsp files
Modified:
trunk/core/src/webapp/jsp/jahia/engines/buttons.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/buttons.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/buttons.jsp&rev=3D19281&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/engines/buttons.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/buttons.jsp Sun Nov 25 20:25:15=
2007
@@ -41,7 +41,13 @@
=
final String noApply =3D (String) engineMap.get("noApply");
final boolean showButtons =3D request.getAttribute("DisableButtons") =
=3D=3D null;
- final LockPrerequisitesResult results =3D LockPrerequisites.getInstanc=
e().getLockPrerequisitesResult((LockKey) engineMap.get("LockKey"));
+ LockKey lockKey =3D (LockKey) engineMap.get("LockKey");
+ final LockPrerequisitesResult results;
+ if (lockKey !=3D null) {
+ results =3D LockPrerequisites.getInstance().getLockPrerequisitesRe=
sult(lockKey);
+ } else {
+ results =3D null;
+ }
%>
=
<div id=3D"buttons">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
