Scarab commit: svn commit: r10606 - trunk/src/java/org/tigris/scarab: om reports

Author: hair
Date: 2008-08-12 14:52:12-0700
New Revision: 10606

Modified:
   trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java
   trunk/src/java/org/tigris/scarab/reports/ReportBridge.java

Log:
Issue SCB2546:  (Exception when create a query with list with user "null") 
 patch from Johannes Hoechstaedter. lots of thanks.


Modified: trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java?view=diff&rev=10606&p1=trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java&p2=trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java&r1=10605&r2=10606
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java	2008-08-12 14:52:12-0700
@@ -903,8 +903,8 @@
         crit.add(MITListPeer.ACTIVE, true);
         Criteria.Criterion userCrit = crit.getNewCriterion(
             MITListPeer.USER_ID, getUserId(), Criteria.EQUAL);
-        userCrit.or(crit.getNewCriterion(
-            MITListPeer.USER_ID, null, Criteria.EQUAL));
+        //userCrit.or(crit.getNewCriterion(
+           // MITListPeer.USER_ID, null, Criteria.EQUAL));
         crit.add(userCrit);
         crit.add(MITListPeer.MODIFIABLE, true);
         crit.add(MITListPeer.ACTIVE, true);

Modified: trunk/src/java/org/tigris/scarab/reports/ReportBridge.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/reports/ReportBridge.java?view=diff&rev=10606&p1=trunk/src/java/org/tigris/scarab/reports/ReportBridge.java&p2=trunk/src/java/org/tigris/scarab/reports/ReportBridge.java&r1=10605&r2=10606
==============================================================================
--- trunk/src/java/org/tigris/scarab/reports/ReportBridge.java	(original)
+++ trunk/src/java/org/tigris/scarab/reports/ReportBridge.java	2008-08-12 14:52:12-0700
@@ -421,6 +421,9 @@
         {
             Log.get().debug("mits were not null");
             mitList = new MITList();
+            
+            mitList.setScarabUser(this.torqueReport.getScarabUser());
+            
             for (Iterator i = mits.iterator(); i.hasNext();) 
             {
                 ModuleIssueType mit = (ModuleIssueType)i.next();