Scarab commit: svn commit: r10879 - trunk: . src/java/org/tigris/scarab/om src/webapp/WEB-INF/templates/viewIssue

Author: jhoech
Date: 2010-01-22 02:57:56-0800
New Revision: 10879

Modified:
   trunk/   (props changed)
   trunk/minimal.properties
   trunk/project.properties
   trunk/src/java/org/tigris/scarab/om/Activity.java
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm
   trunk/wizzard.properties

Log:
MRG - Merged current changes from 0.22 branch back into trunk. Branch was in revision 10875.

Modified: trunk/minimal.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/minimal.properties?view=diff&pathrev=10879&r1=10878&r2=10879
==============================================================================
--- trunk/minimal.properties	(original)
+++ trunk/minimal.properties	2010-01-22 02:57:56-0800
@@ -17,7 +17,7 @@
 #  NEVER change this file by hand! If you want to introduce a new property,
 #  please update
 #  
-#      xdocs/scarab_properties.xml 
+#      scarab_properties.xml 
 #  
 #  instead and afterwards call
 #  

Modified: trunk/project.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.properties?view=diff&pathrev=10879&r1=10878&r2=10879
==============================================================================
--- trunk/project.properties	(original)
+++ trunk/project.properties	2010-01-22 02:57:56-0800
@@ -17,7 +17,7 @@
 #   NEVER change this file by hand! If you want to introduce a new property,
 #   please update
 #   
-#       xdocs/scarab_properties.xml 
+#       scarab_properties.xml 
 #   
 #   instead and afterwards call
 #   

Modified: trunk/src/java/org/tigris/scarab/om/Activity.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/Activity.java?view=diff&pathrev=10879&r1=10878&r2=10879
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Activity.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/Activity.java	2010-01-22 02:57:56-0800
@@ -227,18 +227,9 @@
         if(   getType().equals(ActivityType.DEPENDENCY_DELETED)
            || getType().equals(ActivityType.DEPENDENCY_CHANGED))
          {
-        	if(issue != null 
-        			&& issue.getIssueId().intValue() != getDepend().getIssueRelatedByObservedId().getIssueId().intValue()
-        			&& getOldValue().equals("blocking")){
-            	value = getDepend().getIssueRelatedByObserverId().getUniqueId()
-                + " " + l10n.get("DependsOn") //deprecated, but method is used many times in scarab.
-                + " " + getDepend().getIssueRelatedByObservedId().getUniqueId(); 
-            }
-            else{
-            	value = getDepend().getIssueRelatedByObservedId().getUniqueId()
-            	+ " " + (getOldValue().equals("blocking") ? l10n.get("PrerequisiteFor") : l10n.get(DependTypeManager.getManager().getL10nKey(getOldValue())))
-                + " " + getDepend().getIssueRelatedByObserverId().getUniqueId();  
-            }            
+        	 value = getDepend().getIssueRelatedByObserverId().getUniqueId()
+             + " < " + l10n.get(DependTypeManager.getManager().getL10nKey(getOldValue())) + " > "
+              + " " + getDepend().getIssueRelatedByObservedId().getUniqueId();       
          } else if( getType().equals(ActivityType.ATTACHMENT_REMOVED))
          {
              value = getAttachment().getFileName();

Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm?view=diff&pathrev=10879&r1=10878&r2=10879
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm	2010-01-22 02:57:56-0800
@@ -34,9 +34,7 @@
        #set ($attachLink = $link.setPage("ViewAttachment.vm").setPathInfo("attachId", $file.QueryKey).addPathInfo("filename", $file.FileName).toString())
        ## We add the filename here in case the file is saved, it gives a nice default name
        <td><a href="$attachLink"  
-         onclick="fileWindow=window.open('',
-         'filewindow','resizable=yes,menubar=yes,scrollbars=yes,height=450,width=700')" 
-         target="filewindow">$file.FileName</a> 
+         target="_blank">$file.FileName</a> 
        </td>
        <td>$file.Name</td>
        <td>$file.MimeType</td>

Modified: trunk/wizzard.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/wizzard.properties?view=diff&pathrev=10879&r1=10878&r2=10879
==============================================================================
--- trunk/wizzard.properties	(original)
+++ trunk/wizzard.properties	2010-01-22 02:57:56-0800
@@ -17,7 +17,7 @@
 #  NEVER change this file by hand! If you want to introduce a new property,
 #  please update
 #  
-#      xdocs/scarab_properties.xml 
+#      scarab_properties.xml 
 #  
 #  instead and afterwards call
 #

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2441157