[prev in list] [next in list] [prev in thread] [next in thread]
List: rt-commit
Subject: [Rt-commit] rt branch, master, updated. rt-4.2.11-134-g08df304
From: shawn () bestpractical ! com (Shawn Moore)
Date: 2015-07-16 16:43:25
Message-ID: 20150716164326.30C1E2418005 () booth ! bestpractical ! com
[Download RAW message or body]
The branch, master has been updated
via 08df304218a2ba808f2135730c196ba3388d2c97 (commit)
via d6ce8e6702900ffe49be78a39f6ddc9bf9b3ac82 (commit)
via f7ddacfc2c86ecc4a925e936798a373bd6a7b830 (commit)
via 3251f98e59e6b1811046b3303828b6d896ab90b3 (commit)
from 4b9dd1cda066c400a2e5038fe462dd0e8a264095 (commit)
Summary of changes:
lib/RT/Ticket.pm | 8 ++++++--
lib/RT/Transaction.pm | 2 +-
share/html/Elements/EditTimeValue | 2 +-
share/html/Elements/RT__Ticket/ColumnMap | 4 ++--
share/html/Ticket/Elements/ShowTime | 2 +-
5 files changed, 11 insertions(+), 7 deletions(-)
- Log -----------------------------------------------------------------
commit 08df304218a2ba808f2135730c196ba3388d2c97
Merge: 4b9dd1c d6ce8e6
Author: Shawn M Moore <shawn@bestpractical.com>
Date: Thu Jul 16 12:40:27 2015 -0400
Merge branch '4.4/time-durations'
Conflicts:
share/html/Elements/EditTimeValue
This merge conflicts with the merged 4.0/preserve-ticket-basics
branch. The only contribution to this file that 4.4/time-durations
makes is the sprintf format change, so I applied that to what was
on master from 4.0/preserve-ticket-basics.
diff --cc share/html/Elements/EditTimeValue
index e422c0b,8b92f84..d7b1511
--- a/share/html/Elements/EditTimeValue
+++ b/share/html/Elements/EditTimeValue
@@@ -57,11 -57,9 +57,11 @@@ $InUnits => '
<%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 '%.2f', $Default / 60
- unless $Default eq '';
+if ($Default && $InUnits eq 'hours') {
+ # 0+ here is to remove the ending 0s
- $Default = 0 + sprintf '%.3f', $Default / 60;
++ $Default = 0 + sprintf '%.2f', $Default / 60;
}
</%INIT>
-----------------------------------------------------------------------
_______________________________________________
rt-commit mailing list
rt-commit@lists.bestpractical.com
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/rt-commit
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic