j-trac-svn

[jtrac-svn] SF.net SVN: j-trac:[1334] trunk/jtrac/src/main/java/info/jtrac/wicket/ ItemViewPage.java

[<man...@us...>]

Revision: 1334
          http://j-trac.svn.sourceforge.net/j-trac/?rev=1334&view=rev
Author:   manfredwolff
Date:     2009-12-08 13:06:20 +0000 (Tue, 08 Dec 2009)

Log Message:
-----------
Fixing change request #2384881. Now the summary and the initial comment is changeable from the user who has opened it. In the future this is configurable.

Modified Paths:
--------------
    trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java

Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java	2009-12-08 12:56:36 UTC (rev 1333)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java	2009-12-08 13:06:20 UTC (rev 1334)
@@ -79,11 +79,14 @@
             throw new RestartResponseAtInterceptPageException(ErrorPage.class);
         }                
         
+        // Edit: Also the owner of the item should change it.
         add(new Link("edit") {
             public void onClick() {
                 setResponsePage(new ItemFormPage(item.getId()));
             }
-        }.setVisible(user.isSuperUser() || user.isAdminForSpace(item.getSpace().getId())));                        
+        }.setVisible(item.getLoggedBy().getLoginName().equals(user.getLoginName()) || 
+        		     user.isSuperUser() || 
+        		     user.isAdminForSpace(item.getSpace().getId())));                        
         
         add(new ItemViewPanel("itemViewPanel", item, isRelate || user.getId() == 0));
         


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[jtrac-svn] SF.net SVN: j-trac:[1340] trunk/jtrac/src/main/java/info/jtrac/wicket/ ItemViewPage.java

[<man...@us...>]

Revision: 1340
          http://j-trac.svn.sourceforge.net/j-trac/?rev=1340&view=rev
Author:   manfredwolff
Date:     2009-12-09 13:24:24 +0000 (Wed, 09 Dec 2009)

Log Message:
-----------
The owner can edit a task if it is configured with the jtrac.edit.item configuation is true! Otherwise this feature is disabled.

Modified Paths:
--------------
    trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java

Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java	2009-12-08 15:06:08 UTC (rev 1339)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java	2009-12-09 13:24:24 UTC (rev 1340)
@@ -16,6 +16,8 @@
 
 package info.jtrac.wicket;
 
+import java.util.Map;
+
 import info.jtrac.domain.Item;
 import info.jtrac.domain.ItemSearch;
 import info.jtrac.domain.User;
@@ -80,14 +82,16 @@
         }                
         
         // Edit: Also the owner of the item should change it.
+        final Map<String, String> configMap = getJtrac().loadAllConfig();
+        String shouldEdit = configMap.get("jtrac.edit.item");        
         add(new Link("edit") {
             public void onClick() {
                 setResponsePage(new ItemFormPage(item.getId()));
             }
-        }.setVisible(item.getLoggedBy().getLoginName().equals(user.getLoginName()) || 
+        }.setVisible((item.getLoggedBy().getLoginName().equals(user.getLoginName()) && 
+        		     ("true".equals(shouldEdit))) || 
         		     user.isSuperUser() || 
         		     user.isAdminForSpace(item.getSpace().getId())));                        
-        
         add(new ItemViewPanel("itemViewPanel", item, isRelate || user.getId() == 0));
         
         if(user.isGuestForSpace(item.getSpace()) || isRelate) {        


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[jtrac-svn] SF.net SVN: j-trac:[1348] trunk/jtrac/src/main/java/info/jtrac/wicket/ ItemViewPage.java

[<man...@us...>]

Revision: 1348
          http://j-trac.svn.sourceforge.net/j-trac/?rev=1348&view=rev
Author:   manfredwolff
Date:     2010-05-11 11:51:04 +0000 (Tue, 11 May 2010)

Log Message:
-----------
If "jtrac.edit.item" is set to true (Options | Manage Settings) it is for a normal user only possible to change the main entry if there is no history entry.

Modified Paths:
--------------
    trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java

Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java	2010-05-05 05:50:48 UTC (rev 1347)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java	2010-05-11 11:51:04 UTC (rev 1348)
@@ -16,15 +16,21 @@
 
 package info.jtrac.wicket;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
+import info.jtrac.domain.History;
 import info.jtrac.domain.Item;
+import info.jtrac.domain.ItemItem;
 import info.jtrac.domain.ItemSearch;
 import info.jtrac.domain.User;
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.RestartResponseAtInterceptPageException;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListView;
 
 /**
  * dashboard page
@@ -81,6 +87,15 @@
             throw new RestartResponseAtInterceptPageException(ErrorPage.class);
         }                
         
+        // Edit: Only if there is no history (related item) of the Item
+        boolean nohistory = true;
+        if (item.getHistory() != null) {
+            List<History> history = new ArrayList<History>(item.getHistory());
+            if (history.size() > 1) { 
+            	nohistory = false;
+            }	
+        }
+        
         // Edit: Also the owner of the item should change it.
         final Map<String, String> configMap = getJtrac().loadAllConfig();
         String shouldEdit = configMap.get("jtrac.edit.item");        
@@ -89,7 +104,8 @@
                 setResponsePage(new ItemFormPage(item.getId()));
             }
         }.setVisible((item.getLoggedBy().getLoginName().equals(user.getLoginName()) && 
-        		     ("true".equals(shouldEdit))) || 
+        		     ("true".equals(shouldEdit)) &&
+        		     (nohistory)) || 
         		     user.isSuperUser() || 
         		     user.isAdminForSpace(item.getSpace().getId())));                        
         add(new ItemViewPanel("itemViewPanel", item, isRelate || user.getId() == 0));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.