dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2293
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-10-01 15:45:05 +0700
message:
  Fix bug: Cannot remove Program into Patient module.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js	2010-09-25 10:03:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js	2010-10-01 08:45:05 +0000
@@ -26,6 +26,11 @@
 
 function removeProgram( programId, name )
 {
+	removeItem( programId, name, i18n_confirm_delete, 'removeProgram.action' );
+}
+
+/* function removeProgram( programId, name )
+{
     var result = window.confirm( i18n_confirm_delete + '\n\n' + name );
     
     if ( result )
@@ -53,6 +58,7 @@
         showWarning();
     }
 }
+*/
 
 // -----------------------------------------------------------------------------
 // Criteria association

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2010-09-25 10:03:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2010-10-01 08:45:05 +0000
@@ -24,11 +24,10 @@
           </tr>
 
           <tbody id="list">
-            #set( $mark = false )
             #foreach( $program in $programs )
-              <tr>
+              <tr id="tr${program.id}">
               
-                <td#alternate( $mark )>$encoder.htmlEncode( $program.name )</td>                
+                <td>$encoder.htmlEncode( $program.name )</td>                
                 
                 <td style="text-align:center" #alternate( $mark )>
                   <a href="defineProgramAssociationsForm.action?id=$program.id" title="$i18n.getString( "define_associations" )"><img src="../images/assign.png" alt="$i18n.getString( "define_associations" )"></a>
@@ -59,11 +58,6 @@
                 </td>
                 
               </tr>
-			  #if( $mark )
-				#set( $mark = false )
-			  #else
-				#set( $mark = true )
-			  #end
             #end
 
           </tbody>