[Rt-commit] rtir branch, 2.9-trunk, updated. 3.0.0rc1-46-gc74c502

[Kevin Falcone]

The branch, 2.9-trunk has been updated
       via  c74c50208991c2da47876c9f0c1b2dac6469b67c (commit)
       via  071b22f26b459a2a096f2a7dab77d6e29b287ad4 (commit)
      from  2a10bf187a0fdf5ea7d7d3146c404925c9116000 (commit)

Summary of changes:
 html/RTIR/Reporting/index.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 071b22f26b459a2a096f2a7dab77d6e29b287ad4
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Thu Aug 9 18:51:56 2012 -0400

    Ensure that reports are passed the Constituency selected on the index.html
    
    Back in 2.4, EditRTIRField would put a Constituency field in as a hidden
    field with a pointer to which element in the $ARGS to look up to get the
    selected value.  Because we stopped doing this in 2.6,
    $ARGS{Constituency} doesn't exist and can't be used to pull the selected
    value out.  The smalled fix appears to be to load the CF and just use it
    to get the expected data out of %ARGS.
    
    If you're not using constituencies, I don't think Reports work terribly
    well, so some future work is required to hide the empty dropdown and
    ensure that limits don't rely on them.
    (cherry picked from commit 8535f782e33e2d5697a9600ddc23b6db127d3231)

diff --git a/html/RTIR/Reporting/index.html b/html/RTIR/Reporting/index.html
index 3fa8218..30e774f 100644
--- a/html/RTIR/Reporting/index.html
+++ b/html/RTIR/Reporting/index.html
@@ -70,9 +70,9 @@
 
 <%INIT>
 if ( $ARGS{'HTMLReport'} || $ARGS{'TextReport'} || $ARGS{'SpreadsheetReport'} ) {
-    if ( $ARGS{'Constituency'} ) {
-        delete $ARGS{ 'Object-RT::Ticket--'. $ARGS{'Constituency'} .'-Magic' };
-        $ARGS{'Constituency'} = delete $ARGS{ 'Object-RT::Ticket--'. $ARGS{'Constituency'} };
+    unless ( $ARGS{'Constituency'} ) {
+        my $constituency_cf = RT::IR::GetCustomField('Constituency');
+        $ARGS{'Constituency'} = delete $ARGS{ 'Object-RT::Ticket--CustomField-'. $constituency_cf->Id .'-Values' };
     }
     my $ext = 'html';
     $ext = 'txt' if $ARGS{'TextReport'};

commit c74c50208991c2da47876c9f0c1b2dac6469b67c
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Apr 9 21:34:30 2013 -0400

    Switch to using the standard SelectDate widget
    
    This gets free jQuery date selectors

diff --git a/html/RTIR/Reporting/index.html b/html/RTIR/Reporting/index.html
index 30e774f..301d45f 100644
--- a/html/RTIR/Reporting/index.html
+++ b/html/RTIR/Reporting/index.html
@@ -41,13 +41,13 @@
   <tr>
     <td class="label"><&|/l&>Start Date:</&></td>
     <td class="input">
-      <input type="text" size="30" name="StartDate" value="<% $start->AsString %>" />
+      <& /Elements/SelectDate, Name => 'StartDate', Default => $start->AsString &>
     </td>
   </tr>
   <tr>
     <td class="label"><&|/l&>End Date:</&></td>
     <td class="input">
-      <input type="text" size="30" name="EndDate" value="<% $end->AsString %>" />
+      <& /Elements/SelectDate, Name => 'EndDate', Default => $end->AsString &>
     </td>
   </tr>
 </table>

-----------------------------------------------------------------------