[Rt-commit] rtir branch, 2.5-trunk, updated. c69f53d1bfb8722aac56c182bc378ad9c066eab1

[Ruslan Zakirov]

The branch, 2.5-trunk has been updated
       via  c69f53d1bfb8722aac56c182bc378ad9c066eab1 (commit)
       via  b28be7b1755122488ad8204a11af2ff4c21c2e9b (commit)
       via  d6ee1f579b6262688fdf3e238a10d2d401333237 (commit)
       via  d6798a20bd7f3679e485013b14b15df454e7c6bf (commit)
      from  4409ea82125517e22e362a56f4fcfd5b6ee5cfe0 (commit)

Summary of changes:
 Makefile.PL                       |    2 +-
 html/RTIR/Display.html            |    5 ++++-
 inc/Module/Install/RTx.pm         |   11 ++++++++++-
 inc/Module/Install/RTx/Factory.pm |    2 +-
 lib/RT/IR.pm                      |    2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit d6798a20bd7f3679e485013b14b15df454e7c6bf
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Sep 9 07:31:50 2009 +0400

    drop not required brs, new callbacks

diff --git a/html/RTIR/Display.html b/html/RTIR/Display.html
index 72f5c7b..4e38d44 100644
--- a/html/RTIR/Display.html
+++ b/html/RTIR/Display.html
@@ -36,6 +36,7 @@
 <table class="ticket-summary" width="100%">
 <tr>
 <td class="boxcontainer" valign="top">
+% $m->callback( %ARGS, Ticket => $Ticket, CallbackName => 'LeftColumnStart' );
 
 <&| /Widgets/TitleBox,
     title => loc("The Basics"),
@@ -84,6 +85,8 @@
 </&>
 % }
 </td> <td class="boxcontainer" valign="top">
+% $m->callback( %ARGS, Ticket => $Ticket, CallbackName => 'RightColumnStart' );
+
     <&| /Widgets/TitleBox,
         title => loc('People'), 
         title_href  => RT->Config->Get('WebPath') ."/RTIR/Edit.html?id=". $Ticket->Id,
@@ -91,7 +94,6 @@
     &>
     <& /RTIR/Elements/ShowPeople, Ticket => $Ticket &>
     </&>
-    <br /><br />
     <&| /Widgets/TitleBox, title => loc("Dates"),
         title_href  => RT->Config->Get('WebPath') ."/RTIR/Edit.html?id=". $Ticket->Id,
         class => 'ticket-info-dates',
@@ -101,6 +103,7 @@
     <br />  
   </td>
 </tr>
+
 <tr>
   <td class="boxcontainer" valign="top">
     <& /Ticket/Elements/ShowAttachments, Ticket => $Ticket, 

commit d6ee1f579b6262688fdf3e238a10d2d401333237
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Sep 9 07:32:36 2009 +0400

    * ::States without Queue argument never worked

diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index 1259f80..99a3067 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -203,7 +203,7 @@ Examples:
 sub States {
     my %arg = ( Queue => undef, Active => 1, Inactive => 0, @_ );
 
-    my @queues = !$arg{'Queue'} ? ( values %STATES )
+    my @queues = !$arg{'Queue'} ? (@QUEUES)
         : ref $arg{'Queue'}? @{ $arg{'Queue'} } : ( $arg{'Queue'} );
     
     my @states;

commit b28be7b1755122488ad8204a11af2ff4c21c2e9b
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Sep 9 07:33:19 2009 +0400

    * subst another file, it has been moved

diff --git a/Makefile.PL b/Makefile.PL
index 5271a20..7736a43 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -50,7 +50,7 @@ substitute( {
     },
     'etc/upgrade/upgrade.pl',
     'etc/add_constituency',
-    't/lib/RT/IR/Test.pm',
+    'lib/RT/IR/Test.pm',
 );
 
 tests("t/*.t t/*/*.t");

commit c69f53d1bfb8722aac56c182bc378ad9c066eab1
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Sep 9 07:34:12 2009 +0400

    update M::I

diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 20a354b..a06cb6d 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -144,6 +144,7 @@ dropdb ::
         $has_etc{acl}++;
     }
     if ( -e 'etc/initialdata' ) { $has_etc{initialdata}++; }
+    if ( -e 'etc/upgrade' ) { $has_etc{upgrade}++; }
 
     $self->postamble("$postamble\n");
     unless ( $subdirs{'lib'} ) {
@@ -172,6 +173,14 @@ dropdb ::
 .
         $self->postamble("initdb ::\n$initdb\n");
         $self->postamble("initialize-database ::\n$initdb\n");
+
+        if ( $has_etc{upgrade} ) {
+            my $cmds = <<".";
+\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(upgrade))"
+.
+            $self->postamble("upgrade ::\n$cmds\n");
+        }
+        
     }
 }
 
@@ -188,4 +197,4 @@ sub RTxInit {
 
 __END__
 
-#line 302
+#line 311
diff --git a/inc/Module/Install/RTx/Factory.pm b/inc/Module/Install/RTx/Factory.pm
index 23ce911..cf9ad8e 100644
--- a/inc/Module/Install/RTx/Factory.pm
+++ b/inc/Module/Install/RTx/Factory.pm
@@ -30,7 +30,7 @@ sub RTxInitDB {
         "-I$lib_path",
         "$RT::SbinPath/rt-setup-database",
         "--action"      => $action,
-        "--datadir"     => "etc",
+        "--datadir"     => $action ne 'upgrade'? 'etc' : 'etc/upgrade',
         (($action eq 'insert') ? ("--datafile"    => "etc/initialdata") : ()),
         "--dba"         => $RT::DatabaseUser,
         "--prompt-for-dba-password" => ''

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