svn commit: r654058 - /lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java

Author: andreas
Date: Wed May  7 02:41:25 2008
New Revision: 654058

URL: http://svn.apache.org/viewvc?rev=654058&view=rev
Log:
Don't show 'user is logged in' message when trying to check in your own document.

Modified:
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java?rev=654058&r1=654057&r2=654058&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java Wed May  7 02:41:25 2008
@@ -59,12 +59,15 @@
         Node node = getSourceDocument().getRepositoryNode();
         if (node.isCheckedOut()) {
             String userId = node.getCheckoutUserId();
-            String[] params = { userId };
-            if (isLoggedIn(userId)) {
-                addInfoMessage("user-logged-in", params);
-            }
-            else {
-                addInfoMessage("user-not-logged-in", params);
+            User currentUser = getSession().getIdentity().getUser();
+            if (currentUser == null || !userId.equals(currentUser.getId())) {
+                String[] params = { userId };
+                if (isLoggedIn(userId)) {
+                    addInfoMessage("user-logged-in", params);
+                }
+                else {
+                    addInfoMessage("user-not-logged-in", params);
+                }
             }
         }
     }