From: Nik Okuntseff Date: Sun, 25 Nov 2018 22:37:45 +0000 (+0000) Subject: Started using on behalf group attributes on user edit page. X-Git-Tag: timetracker_1.19-1~547 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f18a557af5593668fe61b8e86db4bcf50970e0bd;p=timetracker.git Started using on behalf group attributes on user edit page. --- diff --git a/WEB-INF/lib/form/FloatField.class.php b/WEB-INF/lib/form/FloatField.class.php index cb035c7c..5b939754 100644 --- a/WEB-INF/lib/form/FloatField.class.php +++ b/WEB-INF/lib/form/FloatField.class.php @@ -37,12 +37,12 @@ class FloatField extends TextField { $this->class = 'FloatField'; $this->name = $name; - $this->mDelimiter = $user->decimal_mark; + $this->mDelimiter = $user->getDecimalMark(); } function localize() { global $user; - $this->mDelimiter = $user->decimal_mark; + $this->mDelimiter = $user->getDecimalMark(); } function setFormat($format) { diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index bd293c45..8b162829 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- {/if} - + -{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())} diff --git a/user_edit.php b/user_edit.php index 49e2505d..580ad73c 100644 --- a/user_edit.php +++ b/user_edit.php @@ -82,7 +82,7 @@ if ($request->isPost()) { $cl_name = $user_details['name']; $cl_login = $user_details['login']; $cl_email = $user_details['email']; - $cl_rate = str_replace('.', $user->decimal_mark, $user_details['rate']); + $cl_rate = str_replace('.', $user->getDecimalMark(), $user_details['rate']); $cl_role_id = $user_details['role_id']; $cl_client_id = $user_details['client_id']; $cl_status = $user_details['status'];
 Anuko Time Tracker 1.18.28.4518 | Copyright © Anuko | +  Anuko Time Tracker 1.18.28.4519 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl index e7d9dd92..a0872a1f 100644 --- a/WEB-INF/templates/user_edit.tpl +++ b/WEB-INF/templates/user_edit.tpl @@ -112,10 +112,10 @@ function handleClientControl() {
{$i18n.form.users.default_rate} (0{$user->decimal_mark}00):{$i18n.form.users.default_rate} (0{$user->getDecimalMark()}00): {$forms.userForm.rate.control}
{$i18n.label.projects}: {$forms.userForm.projects.control}