diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-26 15:41:26 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-26 15:41:26 -0700 |
| commit | 9aee669886202be7035e6c6049fc71bc99dd3013 (patch) | |
| tree | 2fd5bf6de74f3d99270587ffb1833e4188a6373d /rt/share/html/Elements/EditTimeValue | |
| parent | ac20214d38d9af00430423f147b5a0e50751b050 (diff) | |
| parent | 1add633372bdca3cc7163c2ce48363fed3984437 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt/share/html/Elements/EditTimeValue')
| -rw-r--r-- | rt/share/html/Elements/EditTimeValue | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/rt/share/html/Elements/EditTimeValue b/rt/share/html/Elements/EditTimeValue index f1126ec17..e422c0bf1 100644 --- a/rt/share/html/Elements/EditTimeValue +++ b/rt/share/html/Elements/EditTimeValue @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -46,20 +46,22 @@ %# %# END BPS TAGGED BLOCK }}} <input name="<% $ValueName %>" value="<% $Default || '' %>" size="5" /> -<& /Elements/SelectTimeUnits, Name => $UnitName &> +<& /Elements/SelectTimeUnits, Name => $UnitName, Default => $InUnits &> <%ARGS> $Default => '' $Name => '' $ValueName => '' $UnitName => '' -$InputUnits => 'minutes' +$InUnits => '' </%ARGS> <%INIT> $ValueName ||= $Name; $UnitName ||= ($Name||$ValueName) . '-TimeUnits'; +$InUnits ||= $m->request_args->{ $UnitName }; +$InUnits ||= RT->Config->Get('DefaultTimeUnitsToHours', $session{'CurrentUser'}) ? 'hours' : 'minutes'; -if ($InputUnits eq 'minutes' && RT->Config->Get('DefaultTimeUnitsToHours', $session{'CurrentUser'})) { - $Default = sprintf '%.3f', $Default / 60 - unless $Default eq ''; +if ($Default && $InUnits eq 'hours') { + # 0+ here is to remove the ending 0s + $Default = 0 + sprintf '%.3f', $Default / 60; } </%INIT> |