← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6806: Minor fix

 

------------------------------------------------------------
revno: 6806
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-04-29 10:31:18 +0200
message:
  Minor fix
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userCredentials.xsl


--
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-api/src/main/java/org/hisp/dhis/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2012-03-28 09:29:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2012-04-29 08:31:18 +0000
@@ -243,9 +243,6 @@
         this.id = id;
     }
 
-    @JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class} )
-    @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE )
     public String getPassword()
     {
         return password;

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userCredentials.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userCredentials.xsl	2012-03-28 09:29:38 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userCredentials.xsl	2012-04-29 08:31:18 +0000
@@ -11,10 +11,6 @@
           <td>Username</td>
           <td> <xsl:value-of select="d:username" /> </td>
         </tr>
-        <tr>
-          <td>Password</td>
-          <td> <xsl:value-of select="d:password" /> </td>
-        </tr>
       </table>
 
       <xsl:apply-templates select="d:userAuthorityGroups" mode="short" />