[Rt-commit] rtir branch, 2.9-trunk, updated. 37119e24c7319bef7dabe5743f16409f005a5bff

Ruslan Zakirov ruz at bestpractical.com
Tue Jan 11 19:22:16 EST 2011


The branch, 2.9-trunk has been updated
       via  37119e24c7319bef7dabe5743f16409f005a5bff (commit)
       via  0e18e19c69646cd2b51dca2e4611eecb8615345f (commit)
       via  8442fdb08624aaeff4d6f1ece533d24e44b452c5 (commit)
       via  5a1a2cf816ae3f1dacd2183fdc39ffecb8045d14 (commit)
       via  9f4386bbb8659549ffde3a3a0c51d37967bb1c34 (commit)
       via  14ceb2f6fff74c36aa40941df3f357a1abc90df2 (commit)
       via  5f705b1d905f585ed66d694c94fed3c9c3197f65 (commit)
       via  32d400f734c2243bbf739728eeb5078495fb8dab (commit)
      from  86adddf9e52bc73742298acfe4ad5e18c8106a9d (commit)

Summary of changes:
 etc/RTIR_Config.pm            |    8 --------
 etc/add_constituency          |    2 +-
 etc/upgrade/upgrade.pl        |    2 +-
 html/RTIR/Incident/Reply.html |   27 +++++----------------------
 html/RTIR/Update.html         |   28 ++--------------------------
 inc/Module/Install/RTx.pm     |    2 +-
 lib/RT/IR.pm                  |    4 ++--
 lib/RT/IR/Test.pm             |    2 +-
 8 files changed, 13 insertions(+), 62 deletions(-)

- Log -----------------------------------------------------------------
commit 32d400f734c2243bbf739728eeb5078495fb8dab
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jan 12 03:15:12 2011 +0300

    delete Lifecycle map option

diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
index b7c9eed..2a4c787 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -384,12 +384,4 @@ Set(
     },
 );
 
-Set(
-    %LifecycleMap,
-    Incidents          => 'incidents',
-    'Incident Reports' => 'incident_reports',
-    Investigations     => 'investigations',
-    Blocks             => 'blocks',
-);
-
 1;

commit 5f705b1d905f585ed66d694c94fed3c9c3197f65
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jan 12 03:16:23 2011 +0300

    minor

diff --git a/etc/add_constituency b/etc/add_constituency
index 45a2fcd..c02624f 100644
--- a/etc/add_constituency
+++ b/etc/add_constituency
@@ -52,7 +52,7 @@ use warnings;
 use strict;
 
 ### after: use lib qw(@RT_LIB_PATH@);
-use lib qw(/opt/rt4/local/lib /opt/rt4//lib);
+use lib qw(/opt/rt4/local/lib /opt/rt4/lib);
 
 use RT;
 RT::LoadConfig;
diff --git a/etc/upgrade/upgrade.pl b/etc/upgrade/upgrade.pl
index d6760a0..85e2716 100644
--- a/etc/upgrade/upgrade.pl
+++ b/etc/upgrade/upgrade.pl
@@ -4,7 +4,7 @@ use warnings;
 use strict;
 
 ### after: use lib qw(@RT_LIB_PATH@);
-use lib qw(/opt/rt4/local/lib /opt/rt4//lib);
+use lib qw(/opt/rt4/local/lib /opt/rt4/lib);
 
 use RT::Interface::CLI qw(CleanEnv GetCurrentUser GetMessageContent loc); 
 use RT::Tickets; 

commit 14ceb2f6fff74c36aa40941df3f357a1abc90df2
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jan 12 03:17:19 2011 +0300

    switch over /Elements/Tabs

diff --git a/html/RTIR/Update.html b/html/RTIR/Update.html
index 7f0ccd2..9c8c70e 100644
--- a/html/RTIR/Update.html
+++ b/html/RTIR/Update.html
@@ -23,11 +23,7 @@
 %# 
 %# END LICENSE BLOCK
 <& /RTIR/Elements/Header, Title => $title &>
-<& '/RTIR/'.$Type.'/Elements/Tabs', 
-    Ticket => $Ticket, 
-    current_subtab => "RTIR/Edit.html?id=$id",
-    Title => $title &>
-
+<& /Elements/Tabs &>
 
 % $m->callback(CallbackName => 'BeforeActionList', ARGSRef => \%ARGS, Ticket => $Ticket);
 <form action="Update.html" name="TicketUpdate" 

commit 9f4386bbb8659549ffde3a3a0c51d37967bb1c34
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jan 12 03:17:49 2011 +0300

    simplify title generation

diff --git a/html/RTIR/Update.html b/html/RTIR/Update.html
index 9c8c70e..6f6c913 100644
--- a/html/RTIR/Update.html
+++ b/html/RTIR/Update.html
@@ -94,38 +94,18 @@
 
 <%INIT>
 
-my $title;
 my $Ticket = LoadTicket($id);
-
 $id = $ARGS{'id'} = $Ticket->Id;
 
-
 $m->callback(CallbackName => 'Initial', %ARGS, Ticket => $Ticket);
 
 my $Type = RT::IR::TicketType( Ticket => $Ticket );
 
-my $name;
-if ($Type eq 'Report') {
-    $name = "Incident Report";
-} else {
-    $name = $Type;
-}
-
 $DefaultStatus ||= $ARGS{'Status'} || '';
 $ARGS{'Status'} ||= $DefaultStatus; # XXX: we should get rid of the DefaultStatus
 $DefaultStatus = 'open' if $DefaultStatus eq 'new';
 
-if ( $DefaultStatus eq 'resolved' ) {
-    $title = loc("Resolve [_1] #[_2] ([_3])", $name, $id, $Ticket->Subject);
-} elsif ( $DefaultStatus eq 'rejected' ) {
-    if ( $Type eq 'Incident' ) {
-        $title = loc("Abandon [_1] #[_2] ([_3])", $name, $id, $Ticket->Subject);
-    } else {
-        $title = loc("Reject [_1] #[_2] ([_3])", $name, $id, $Ticket->Subject);
-    }
-} else {
-    $title = loc("Update [_1] #[_2] ([_3])", $name, $id, $Ticket->Subject);
-}
+my $title = loc("Update [_1] #[_2] ([_3])", $type, $id, $Ticket->Subject);
 
 my $CanRespond = 0;
 my $CanComment = 0;

commit 5a1a2cf816ae3f1dacd2183fdc39ffecb8045d14
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jan 12 03:18:24 2011 +0300

    switch over new Tabs

diff --git a/html/RTIR/Incident/Reply.html b/html/RTIR/Incident/Reply.html
index 123df09..5b39aa6 100644
--- a/html/RTIR/Incident/Reply.html
+++ b/html/RTIR/Incident/Reply.html
@@ -23,16 +23,7 @@
 %# 
 %# END LICENSE BLOCK
 <& /RTIR/Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'} &>
-<& /RTIR/Search/Elements/RefineTabs, 
-    Title          => $title,
-
-    Queue          => 'Incident Reports',
-    Ticket         => $IncidentObj,
-    QueryString    => $QueryString,
-
-    current_tab    => $current_tab,
-    current_subtab => "RTIR/Search/Refine.html",
-&>
+<& /Elements/Tabs &>
 
 % $m->callback(CallbackName => 'BeforeActionList', Actions => \@results, ARGSRef => \%ARGS, Ticket => $IncidentObj);
 <& /Elements/ListActions, actions => \@results &>
@@ -51,7 +42,7 @@
 <h2><&|/l&>Reporters</&></h2>
 <& /RTIR/Search/Elements/ShowResults,
     Queue         => 'Incident Reports',
-    BaseURL       => $current_tab,
+    BaseURL       => $BaseURL,
     BaseQuery     => RT::IR->BaseQuery(Queue => 'Incident Reports', MemberOf => $id),
     Query         => $Query,
     DisplayFormat => "__CheckBox.{SelectedReports}__, $Format",
@@ -66,7 +57,7 @@
 <h2><&|/l&>Investigation Correspondents</&></h2>
 <& /RTIR/Search/Elements/ShowResults,
     Queue         => 'Investigations',
-    BaseURL       => $current_tab,
+    BaseURL       => $BaseURL,
     BaseQuery     => RT::IR->BaseQuery(Queue => 'Investigations', MemberOf => $id),
     Query         => $Query,
     DisplayFormat => "__CheckBox.{SelectedInvestigations}__, $Format",
@@ -81,7 +72,7 @@
 <h2><&|/l&>Blocks Correspondents</&></h2>
 <& /RTIR/Search/Elements/ShowResults,
     Queue         => 'Investigations',
-    BaseURL       => $current_tab,
+    BaseURL       => $BaseURL,
     BaseQuery     => RT::IR->BaseQuery(Queue => 'Blocks', MemberOf => $id),
     Query         => $Query,
     DisplayFormat => "__CheckBox.{SelectedBlocks}__, $Format",
@@ -245,15 +236,7 @@ foreach (qw(SelectedReports SelectedInvestigations SelectedBlocks)) {
     }
 }
 
-my $QueryString = $m->comp( '/Elements/QueryString',
-                            Query => $Query,
-                            Format => $Format,
-                            Rows => $Rows,
-                            OrderBy => $OrderBy,
-                            Order => $Order,
-                            Page => $Page);
-
-my $current_tab = "RTIR/Incident/Reply.html?".
+my $BaseURL = "RTIR/Incident/Reply.html?".
     $m->comp('/Elements/QueryString',
         id            => $id,
         All           => $All,

commit 8442fdb08624aaeff4d6f1ece533d24e44b452c5
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jan 12 03:19:39 2011 +0300

    typo and missing variable

diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index a9a057b..9ab6c75 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -302,8 +302,8 @@ sub ChildrenQuery {
 
     my @parts;
     push @parts, $self->NewQuery(
-        Queue  => $Queue,
-        states => $arga{'States'},
+        Queue  => $args{'Queue'},
+        states => $args{'States'},
         add_states => $args{'AddStates'},
     );
     push @parts, $self->BaseQuery( Queue => $args{'Queue'} );

commit 0e18e19c69646cd2b51dca2e4611eecb8615345f
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jan 12 03:20:12 2011 +0300

    minor

diff --git a/lib/RT/IR/Test.pm b/lib/RT/IR/Test.pm
index 50086a8..5cae126 100644
--- a/lib/RT/IR/Test.pm
+++ b/lib/RT/IR/Test.pm
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 ### after: use lib qw(@RT_LIB_PATH@);
-use lib qw(/opt/rt4/local/lib /opt/rt4//lib);
+use lib qw(/opt/rt4/local/lib /opt/rt4/lib);
 
 package RT::IR::Test;
 

commit 37119e24c7319bef7dabe5743f16409f005a5bff
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jan 12 03:20:48 2011 +0300

    update M::I::RTx

diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index b780a6c..5480124 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -42,8 +42,8 @@ sub RTx {
         $INC{'RT.pm'} = "$RT::LocalPath/lib/RT.pm";
     } else {
         local @INC = (
-            $ENV{RTHOME} ? ( $ENV{RTHOME}, "$ENV{RTHOME}/lib" ) : (),
             @INC,
+            $ENV{RTHOME} ? ( $ENV{RTHOME}, "$ENV{RTHOME}/lib" ) : (),
             map { ( "$_/rt3/lib", "$_/lib/rt3", "$_/lib" ) } grep $_,
             @prefixes
         );

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


More information about the Rt-commit mailing list