← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2453: Cleanup

 

------------------------------------------------------------
revno: 2453
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2010-12-30 10:59:11 +0100
message:
  Cleanup
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/userGroupList.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-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js	2010-12-23 12:27:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js	2010-12-30 09:59:11 +0000
@@ -1,6 +1,8 @@
+
 // -----------------------------------------------------------------------------
 // Search users
 // -----------------------------------------------------------------------------
+
 function searchUserName()
 {
 	var key = getFieldValue( 'key' );
@@ -55,8 +57,6 @@
 	removeItem( userId, username, i18n_confirm_delete, 'removeUser.action' );
 }
 
-
-
 // -----------------------------------------------------------------------------
 // Usergroup functionality
 // -----------------------------------------------------------------------------
@@ -72,7 +72,6 @@
 function userGroupReceived( userGroupElement )
 {
     setInnerHTML( 'nameField', getElementValue( userGroupElement, 'name' ) );
-    setInnerHTML( 'idField', getElementValue( userGroupElement, 'id' ) );
     setInnerHTML( 'noOfGroupField', getElementValue( userGroupElement, 'noOfUsers' ) );
 
     showDetails();
@@ -82,33 +81,3 @@
 {
     removeItem( userGroupId, userGroupName, i18n_confirm_delete, "removeUserGroup.action" );
 }
-
-function addValidation ()
-{
-    var k =0 ;
-    var xyz=document.getElementById("name");
-    var abc =document.getElementById("groupMembers");
-    var c  = abc.length ;
-    if( xyz.value == "") {
-        alert ("please select name ");
-        return false;
-    }
-    else if ( c <= 0 ){
-        alert("please select at least one member");
-        return false ;
-    } 
-    else if (c > 0 )
-    {
-        for( k =0;k<=c;k++)
-        {
-            abc.options[k].selected = true ;        
-        }
-    }
-        
-    return true;
-}
-
-function editValidation ()
-{
-    alert("dev");
-}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/userGroupList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/userGroupList.vm	2010-12-30 04:29:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/userGroupList.vm	2010-12-30 09:59:11 +0000
@@ -40,7 +40,6 @@
                     <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"/></a>
                 </div>
                 <p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
-                <p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
                 <p><label>$i18n.getString( "no_of_Users" ):</label><br/><span id="noOfGroupField"></span></p>
             </div>