Changeset 18297

Show
Ignore:
Timestamp:
11/04/08 12:12:25 (2 months ago)
Author:
ritesh
Message:

Fixed - bug-418 Duplicate form records are displayed after re-assigning a form

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/src/net/project/form/FormList.java

    r17966 r18297  
    4343import net.project.persistence.IXMLPersistence; 
    4444import net.project.persistence.PersistenceException; 
     45import net.project.resource.AssignmentStatus; 
    4546import net.project.resource.Person; 
    4647import net.project.resource.Roster; 
    …… 
    21392140                //selectString = selectString + " , PN_ASSIGNMENT.PERSON_ID  "; 
    21402141                fromString = fromString + " , PN_ASSIGNMENT "; 
    2141                 whereString = whereString +  " AND PN_ASSIGNMENT.OBJECT_ID(+) = " +  m_form.m_master_table_name + ".object_id AND PN_ASSIGNMENT.RECORD_STATUS(+) = 'A' "; 
     2142                whereString = whereString +  " AND PN_ASSIGNMENT.OBJECT_ID(+) = " +  m_form.m_master_table_name + ".object_id AND PN_ASSIGNMENT.RECORD_STATUS(+) = 'A' AND PN_ASSIGNMENT.STATUS_ID <> "+AssignmentStatus.REJECTED.getID(); 
    21422143        } 
    21432144         

  • trunk/core/web/jsp/form/FormEditProcessing.jsp

    r18261 r18297  
    112112                        assignment.store(); 
    113113                        // to set the status of previous resource as rejected while reassigning the form to another resource  
    114                         assignment.updateStatus(AssignmentStatus.REJECTED.toString()); 
     114                        assignment.updateStatus(AssignmentStatus.REJECTED.getID()); 
    115115                        continue; 
    116116                    }