svn commit: [jahia] r14900 - in /trunk/core/src: java/org/jahia/engines/lock/LockEngine.java webapp/jsp/jahia/engines/lock/lock.jsp

[xlawrence]

Author: xlawrence
Date: Tue Aug 15 14:23:51 2006
New Revision: 14900

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14900&repname=jahia
Log:
show details by default. Always show them actually

Modified:
    trunk/core/src/java/org/jahia/engines/lock/LockEngine.java
    trunk/core/src/webapp/jsp/jahia/engines/lock/lock.jsp

Modified: trunk/core/src/java/org/jahia/engines/lock/LockEngine.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/engines/lock/LockEngine.java&rev=14900&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/engines/lock/LockEngine.java (original)
+++ trunk/core/src/java/org/jahia/engines/lock/LockEngine.java Tue Aug 15 
14:23:51 2006
@@ -185,16 +185,13 @@
         engineMap.put("screen", actionScreen);
         // screen = display
         if ("display".equals (actionScreen)) {
-            String lockKeyStr = jParams.getParameter ("lockKey");
+            final String lockKeyStr = jParams.getParameter ("lockKey");
             if (lockKeyStr != null) {
-                LockKey lockKey = LockKey.composeLockKey (lockKeyStr);
-                LockPrerequisitesResult lpr = LockPrerequisites.getInstance ().
-                        getLockPrerequisitesResult (lockKey);
-                String showDetails = jParams.getParameter ("showDetails");
-                if (showDetails != null) {
-                    lpr.setShowDetails (Boolean.valueOf 
(showDetails).booleanValue ());
-                }
-                initLockEngine (jParams, engineMap, lockKey);
+                final LockKey lockKey = LockKey.composeLockKey (lockKeyStr);
+                final LockPrerequisitesResult lpr = 
LockPrerequisites.getInstance ().getLockPrerequisitesResult(lockKey);
+
+                lpr.setShowDetails(true);
+                initLockEngine(jParams, engineMap, lockKey);
 
                 logger.debug("engineMap: " + engineMap);
 

Modified: trunk/core/src/webapp/jsp/jahia/engines/lock/lock.jsp
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/webapp/jsp/jahia/engines/lock/lock.jsp&rev=14900&repname=jahia
==============================================================================
--- trunk/core/src/webapp/jsp/jahia/engines/lock/lock.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/lock/lock.jsp Tue Aug 15 14:23:51 
2006
@@ -79,7 +79,6 @@
 
 <input type="hidden" name="redirectedToLockEngine" value="yes"/>
 <input type="hidden" name="lockKey" value="<%=lockKey%>"/>
-<input type="hidden" name="showDetails" 
value="<%=lockPrerequisitesResult.shouldShowDetails()%>"/>
 
 <p>
     <jahia:engineResourceBundle 
resourceName="org.jahia.engines.lock.cannotGetLock.label"/> [<%=lockKey%>].
@@ -126,7 +125,6 @@
                             jParams.getSessionID().equals(lockID);
                     final boolean isSameUser = jahiaUser != null &&
                             
jParams.getUser().getUserKey().equals(jahiaUser.getUserKey());
-                    if (lockPrerequisitesResult.shouldShowDetails()) {
         %>
         <div class="clearing">&nbsp;</div>
         <jahia:engineResourceBundle 
resourceName="org.jahia.engines.lock.objectLockedByUser.label"/>: &nbsp;
@@ -150,7 +148,6 @@
         <jahia:engineResourceBundle 
resourceName="org.jahia.engines.lock.remainingTime.label"/>:
         <%= h1 + " h " + m1 + " m " + s1 + " s"%><%
                 }
-            }
             if (lockStealed.booleanValue()) { %>
 
         <div class="clearing">&nbsp;</div>