projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more refactoring.
[timetracker.git]
/
WEB-INF
/
templates
/
user_edit.tpl
diff --git
a/WEB-INF/templates/user_edit.tpl
b/WEB-INF/templates/user_edit.tpl
index
4a45f77
..
0c24a01
100644
(file)
--- a/
WEB-INF/templates/user_edit.tpl
+++ b/
WEB-INF/templates/user_edit.tpl
@@
-95,24
+95,28
@@
function handleClientControl() {
<td align="right" nowrap>{$i18n.label.email}:</td>
<td>{$forms.userForm.email.control}</td>
</tr>
<td align="right" nowrap>{$i18n.label.email}:</td>
<td>{$forms.userForm.email.control}</td>
</tr>
-{if $user->i
sManager() && ($user->id != $user_id)
}
+{if $user->i
d != $user_id
}
<tr>
<td align="right">{$i18n.form.users.role}:</td>
<td>{$forms.userForm.role.control} {$forms.userForm.client.control}</td>
</tr>
<tr>
<td align="right">{$i18n.form.users.role}:</td>
<td>{$forms.userForm.role.control} {$forms.userForm.client.control}</td>
</tr>
-{/if}
-{* Prohibit deactivating team manager. Deactivating others is ok. *}
-{if $user->canManageTeam() && !($user->isManager() && $user->id == $user_id)}
<tr>
<td align="right">{$i18n.label.status}:</td>
<td>{$forms.userForm.status.control}</td>
</tr>
<tr>
<td align="right">{$i18n.label.status}:</td>
<td>{$forms.userForm.status.control}</td>
</tr>
+{/if}
+{if $user->id == $user_id}
+ <tr>
+ <td align="right">{$i18n.form.users.role}:</td>
+ <td>{$user->role_name} {if $can_swap}<a href="swap_roles.php">{$i18n.form.user_edit.swap_roles}</a>{/if}</td>
+ </tr>
{/if}
<tr>
{/if}
<tr>
- <td align="right">{$i18n.form.users.default_rate} (0{$user->
decimal_mark
}00):</td>
+ <td align="right">{$i18n.form.users.default_rate} (0{$user->
getDecimalMark()
}00):</td>
<td>{$forms.userForm.rate.control}</td>
</tr>
<td>{$forms.userForm.rate.control}</td>
</tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && $show_projects}
+ <tr><td> </td></tr>
<tr valign="top">
<td align="right">{$i18n.label.projects}:</td>
<td>{$forms.userForm.projects.control}</td>
<tr valign="top">
<td align="right">{$i18n.label.projects}:</td>
<td>{$forms.userForm.projects.control}</td>