dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11160
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-06-06 11:55:20 +0200
message:
  Fixed issue, related to cacheability of user profile
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.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-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm	2012-11-08 19:37:56 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm	2013-06-06 09:55:20 +0000
@@ -1,7 +1,7 @@
 <script type="text/javascript" src="../dhis-web-commons/javascripts/useraccount/updateUserProfileForm.js"></script>
 
 <div id="updateProfileHeader">$encoder.htmlEncode( $userCredentials.user.getName() )</div>
-<div id="updateProfileLink"><a class="blueButtonLink" href="../dhis-web-dashboard-integration/profile.action">$i18n.getString( "view_profile" )</a></div>
+<div id="updateProfileLink"><a class="blueButtonLink" href="../dhis-web-dashboard-integration/profile.action?id=${currentUser.uid}">$i18n.getString( "view_profile" )</a></div>
 
 <form id="updateUserProfileForm" name="updateUserProfileForm" class="inputForm">
 <div><input type="hidden" id="id" name="id" value="$userCredentials.id"/></div>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2013-03-13 10:08:45 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2013-06-06 09:55:20 +0000
@@ -5,7 +5,7 @@
 </script>
 
 <h3>
-<a href="profile.action"><img src="../images/user_small.png"></a> &nbsp;<a href="profile.action">$encoder.htmlEncode( $currentUser.name )</a>
+<a href="profile.action?id=${currentUser.uid}"><img src="../images/user_small.png"></a> &nbsp;<a href="profile.action?id=${currentUser.uid}">$encoder.htmlEncode( $currentUser.name )</a>
 #if( !$currentUser.profileFilled )<span class="alert">(</span><a class="alert" href="../dhis-web-commons-about/showUpdateUserProfileForm.action">$i18n.getString( "update_profile" )</a><span class="alert">)</span> #end
 &nbsp;&#8226;&nbsp; <a href="showSendFeedback.action">$i18n.getString( "write_feedback" )</a>
 #if( $messageCount > 0 )&nbsp;&#8226;&nbsp; <a class="alert" href="message.action">$messageCount #if( $messageCount > 1 )$i18n.getString( "unread_messages" )#else$i18n.getString( "unread_message" )#end</a> #end
@@ -15,7 +15,7 @@
 
 <div id="dashboardMenu" class="horizontalMenu">
 	<ul>
-        <li><a class="greyButtonLink" href="profile.action">$i18n.getString( "profile" )</a></li>
+        <li><a class="greyButtonLink" href="profile.action?id=${currentUser.uid}">$i18n.getString( "profile" )</a></li>
 		<li><a class="greyButtonLink" href="message.action">$i18n.getString( "messages" )</a></li>
 		<li><a class="greyButtonLink" href="interpretation.action">$i18n.getString( "interpretations" )</a></li>
 		<li><a class="greyButtonLink" href="getAllUserGroups.action">$i18n.getString( "groups" )</a></li>