dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8466
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-10 19:15:59 +0200
message:
  Mobile: removed jobTitle from settings page
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.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-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java	2012-10-10 17:14:33 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java	2012-10-10 17:15:59 +0000
@@ -168,7 +168,6 @@
         currentUser.setSurname( settings.getSurname() );
         currentUser.setEmail( settings.getEmail() );
         currentUser.setPhoneNumber( settings.getPhoneNumber() );
-        currentUser.setJobTitle( settings.getJobTitle() );
 
         userService.updateUser( currentUser );
     }
@@ -189,7 +188,6 @@
         currentUser.setSurname( settings.getSurname() );
         currentUser.setEmail( settings.getEmail() );
         currentUser.setPhoneNumber( settings.getPhoneNumber() );
-        currentUser.setJobTitle( settings.getJobTitle() );
 
         userService.updateUser( currentUser );
     }

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm	2012-10-10 17:14:33 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm	2012-10-10 17:15:59 +0000
@@ -10,7 +10,6 @@
             $('#surnameInput').val(data.surname);
             $('#emailInput').val(data.email);
             $('#phoneNumberInput').val(data.phoneNumber);
-            $('#jobTitleInput').val(data.jobTitle);
         });
 
         $('input:submit').bind('click', function(e) {
@@ -59,9 +58,6 @@
            <label for="phoneNumberInput">Phone Number</label>
            <input id="phoneNumberInput" name="phoneNumber" type="text" placeholder="Enter phone number.." />
 
-           <label for="jobTitleInput">Job Title</label>
-           <input id="jobTitleInput" name="jobTitle" type="text" placeholder="Enter job title.." />
-
            <input type="submit" value="Save settings" />
        </form>
    	</section>