dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24235
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11838: minor
------------------------------------------------------------
revno: 11838
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-08-30 10:00:04 +0700
message:
minor
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/ReceivingSMSAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.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-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/ReceivingSMSAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/ReceivingSMSAction.java 2013-08-30 02:54:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/ReceivingSMSAction.java 2013-08-30 03:00:04 +0000
@@ -38,7 +38,6 @@
import org.hisp.dhis.sms.incoming.IncomingSmsService;
import org.hisp.dhis.sms.incoming.SmsMessageStatus;
import org.springframework.beans.factory.annotation.Autowired;
-import com.opensymphony.xwork2.Action;
/**
* @author Nguyen Kim Lai
@@ -154,7 +153,7 @@
}
this.paging = createPaging( incomingSmsService.getSmsByStatus( null, keyword.trim() ).size() );
-
+
if ( smsStatus == null || smsStatus.trim().equals( "" ) )
{
listIncomingSms = new ArrayList<IncomingSms>( incomingSmsService.getSmsByStatus( null, keyword,
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm 2013-08-30 02:54:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm 2013-08-30 03:00:04 +0000
@@ -208,7 +208,6 @@
<th style="text-align:center">$i18n.getString( "delete" )</th>
</thead>
<tbody>
- $listIncomingSms.size()
#foreach( $incomingSms in $listIncomingSms )
<tr id="tr${incomingSms.id}" height="40">
<td style="text-align:center"><input type="checkbox" name="mycheck" value="$incomingSms.id"/></td>