dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18854
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-04-09 15:20:27 +0200
message:
  enter key can now be used to submit paging changes
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/serverside-pagination.html


--
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-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js	2015-04-09 10:18:52 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js	2015-04-09 13:20:27 +0000
@@ -318,7 +318,8 @@
                                             $scope.queryUrl,
                                             $scope.programUrl,
                                             $scope.attributeUrl.url,
-                                            $scope.pager).then(function(data){
+                                            $scope.pager,
+                                            true).then(function(data){
             //$scope.trackedEntityList = data;            
             if(data.rows){
                 $scope.teiCount = data.rows.length;
@@ -357,7 +358,6 @@
     $scope.setAttributesForSearch( $scope.selectedProgramForRelative );
     
     $scope.jumpToPage = function(){
-        console.log(' am I here... ');
         if($scope.pager && $scope.pager.page && $scope.pager.pageCount && $scope.pager.page > $scope.pager.pageCount){
             $scope.pager.page = $scope.pager.pageCount;
         }
@@ -370,8 +370,7 @@
         $scope.search($scope.selectedSearchMode);
     };
     
-    $scope.getPage = function(page){    
-        console.log(' am I here... ');
+    $scope.getPage = function(page){
         $scope.pager.page = page;
         $scope.search($scope.selectedSearchMode);
     };

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-03-31 12:18:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-04-09 13:20:27 +0000
@@ -111,6 +111,7 @@
 add_relationship=Add relationship
 a_is_to_b=A is to B
 b_is_to_a=B is to A
+select=Select
 please_select_source=Please select source
 register_new=Register new
 search_from_existing=Search from existing

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/serverside-pagination.html'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/serverside-pagination.html	2015-01-08 16:39:10 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/serverside-pagination.html	2015-04-09 13:20:27 +0000
@@ -5,10 +5,10 @@
                 {{'total_number_of_pages'| translate}}: {{pager.pageCount}}
             </td>
             <td>
-                <span>{{'rows_per_page'| translate}}:</span> <input type="text" min="1" style="width:50px;" ng-model="pager.pageSize" ng-blur="resetPageSize()"> 
+                <span>{{'rows_per_page'| translate}}:</span> <input type="text" min="1" style="width:50px;" ng-model="pager.pageSize" d2-enter="resetPageSize()" ng-blur="resetPageSize()"> 
             </td>
             <td>
-                <span>{{'jump_to_page'| translate}}:</span> <input type="text" min="1" style="width:50px;" ng-model="pager.page" ng-blur="jumpToPage()"> 
+                <span>{{'jump_to_page'| translate}}:</span> <input type="text" min="1" style="width:50px;" ng-model="pager.page" d2-enter="jumpToPage()" ng-blur="jumpToPage()"> 
             </td>
         </tr>
         <tr>