dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #34188
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17552: Setting ouwt offline level to 1 in add/edit user screen
------------------------------------------------------------
revno: 17552
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-11-20 16:06:59 +0100
message:
Setting ouwt offline level to 1 in add/edit user screen
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user_tmpl.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.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-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2014-11-20 13:34:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2014-11-20 15:06:59 +0000
@@ -3,7 +3,7 @@
// -----------------------------------------------------------------------------
$( document ).ready( function() {
- selection.setOfflineLevel(1);
+ selection.setOfflineLevel( 1 );
selection.setAutoSelectRoot( false );
selection.setRootUnselectAllowed( true );
selection.setListenerFunction( organisationUnitSelected, true );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm 2014-10-17 11:13:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm 2014-11-20 15:06:59 +0000
@@ -31,6 +31,7 @@
checkValueIsExist("inviteUsername", "validateUser.action");
ouwtSelected = selection.getSelected();
+ selection.setOfflineLevel( 1 );
selection.setMultipleSelectionAllowed( true );
selection.setUnselectAllowed( true );
selection.setAutoSelectRoot( false );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user_tmpl.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user_tmpl.js 2013-12-04 14:39:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user_tmpl.js 2014-11-20 15:06:59 +0000
@@ -2,6 +2,7 @@
jQuery(document).ready(function() {
tableSorter('userList');
+ selection.setOfflineLevel(1);
selection.setListenerFunction(orgUnitSelected, true);
dhis2.contextmenu.makeContextMenu({
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2014-09-11 12:33:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2014-11-20 15:06:59 +0000
@@ -31,6 +31,7 @@
ouwtSelected = selection.getSelected();
selection.clearSelected(); // Sync ouwt from server
+ selection.setOfflineLevel( 1 );
selection.setMultipleSelectionAllowed( true );
selection.setUnselectAllowed( true );
selection.setAutoSelectRoot( false );