[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[32180] branches/proposals/6.x/templates/ tiki-adminusers.tpl

[<ny...@us...>]

Revision: 32180
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32180&view=rev
Author:   nyloth
Date:     2011-01-26 18:09:32 +0000 (Wed, 26 Jan 2011)

Log Message:
-----------
[bp/r31810][FIX] admin users: don't allow the admin to ask the user to change his password at first login when he can't do this (when change_password pref is disabled)

Modified Paths:
--------------
    branches/proposals/6.x/templates/tiki-adminusers.tpl

Modified: branches/proposals/6.x/templates/tiki-adminusers.tpl
===================================================================
--- branches/proposals/6.x/templates/tiki-adminusers.tpl	2011-01-26 18:08:31 UTC (rev 32179)
+++ branches/proposals/6.x/templates/tiki-adminusers.tpl	2011-01-26 18:09:32 UTC (rev 32180)
@@ -420,7 +420,7 @@
 							<span id="genPass">{button href="#" _onclick="genPass('genepass');runPassword(document.RegForm.genepass.value, 'mypassword');checkPasswordsMatch('#pass2', '#pass1', '#mypassword2_text');return false;" _text="{tr}Generate a password{/tr}"}</div>
 						</td></tr>
 					{/if}
-					{if $userinfo.login neq 'admin'}
+					{if $userinfo.login neq 'admin' && $prefs.change_password neq 'n'}
 						<tr>
 							<td>&nbsp;</td>
 							<td>
@@ -528,8 +528,10 @@
                     <br />
 					<label>{tr}Create groups:{/tr} <input type="checkbox" name="createGroup" /></label>
                     <br />
+					{if $prefs.change_password neq 'n'}
                      <label>{tr}User must change password at first login:{/tr} <input type="checkbox" name="forcePasswordChange" /></label>
 					<br />
+					{/if}
                     <label>{tr}Send an email to the user in order to allow him to validate his account.{/tr} <input type="checkbox" name="notification" /></label>
 				</td>
 			</tr>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.