[Rt-commit] rtir branch, 2.9-trunk, updated. 3.0.0rc1-38-g505733f

[Kevin Falcone]

The branch, 2.9-trunk has been updated
       via  505733fd682b4932198cc86a62b43281cc8b596c (commit)
       via  2678087491af7573da24967b93ddb31dba2b49b9 (commit)
      from  02af3f5933d74adac08fd2567023c1a5c0a0d98b (commit)

Summary of changes:
 Makefile.PL                       |  2 +-
 html/RTIR/Prefs/Home.html         |  6 +++---
 inc/Module/Install/RTx.pm         | 15 ++++++++-------
 inc/Module/Install/RTx/Factory.pm |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit 2678087491af7573da24967b93ddb31dba2b49b9
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Apr 8 13:47:00 2013 -0400

    bump Module::Install::RTx

diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index ce01018..c9fe996 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -8,13 +8,13 @@ no warnings 'once';
 
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.30';
+our $VERSION = '0.31';
 
 use FindBin;
 use File::Glob     ();
 use File::Basename ();
 
-my @DIRS = qw(etc lib html bin sbin po var);
+my @DIRS = qw(etc lib html static bin sbin po var);
 my @INDEX_DIRS = qw(lib bin sbin);
 
 sub RTx {
@@ -62,10 +62,11 @@ sub RTx {
     unshift @INC, "$RT::LocalPath/lib" if $RT::LocalPath;
     unshift @INC, $lib_path;
 
-    $RT::LocalVarPath  ||= $RT::VarPath;
-    $RT::LocalPoPath   ||= $RT::LocalLexiconPath;
-    $RT::LocalHtmlPath ||= $RT::MasonComponentRoot;
-    $RT::LocalLibPath  ||= "$RT::LocalPath/lib";
+    $RT::LocalVarPath    ||= $RT::VarPath;
+    $RT::LocalPoPath     ||= $RT::LocalLexiconPath;
+    $RT::LocalHtmlPath   ||= $RT::MasonComponentRoot;
+    $RT::LocalStaticPath ||= $RT::StaticPath;
+    $RT::LocalLibPath    ||= "$RT::LocalPath/lib";
 
     my $with_subdirs = $ENV{WITH_SUBDIRS};
     @ARGV = grep { /WITH_SUBDIRS=(.*)/ ? ( ( $with_subdirs = $1 ), 0 ) : 1 }
@@ -208,4 +209,4 @@ sub requires_rt {
 
 __END__
 
-#line 328
+#line 329
diff --git a/inc/Module/Install/RTx/Factory.pm b/inc/Module/Install/RTx/Factory.pm
index a8702e4..76ab761 100644
--- a/inc/Module/Install/RTx/Factory.pm
+++ b/inc/Module/Install/RTx/Factory.pm
@@ -34,7 +34,7 @@ sub RTxInitDB {
         "--action"      => $action,
         "--datadir"     => "etc",
         (($action eq 'insert') ? ("--datafile"    => "etc/initialdata") : ()),
-        "--dba"         => $RT::DatabaseUser,
+        "--dba"         => $RT::DatabaseAdmin || $RT::DatabaseUser,
         "--prompt-for-dba-password" => '',
         (RT::System->can('AddUpgradeHistory') ? ("--package" => $name, "--ext-version" => $version) : ()),
     );

commit 505733fd682b4932198cc86a62b43281cc8b596c
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Apr 8 14:21:12 2013 -0400

    Account for the SearchesForObject changes in d04c615489
    
    The code now returns My Tickets as well as loc(My Tickets) which means
    that the actual object comes as the third return value rather than the
    second one.
    
    This now means that translated saved search names will show up in the
    Prefs page too (such as Bookmarked Tickets being Tickets favoris if
    you're running RT in French).
    
    This change was shipped in 4.0.11 so ensure that users are running a new
    enough RT to make use of it.

diff --git a/Makefile.PL b/Makefile.PL
index f217db1..20105c1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,7 +5,7 @@ license('GPL Version 2');
 author('Best Practical Solutions <sales at bestpractical.com>');
 version_from('lib/RT/IR.pm');
 
-requires_rt('4.0.6');
+requires_rt('4.0.11');
 
 # XXX: This should be reported by M::I::RTx
 my ($lib_path) = $INC{'RT.pm'} =~ /^(.*)[\\\/]/;
diff --git a/html/RTIR/Prefs/Home.html b/html/RTIR/Prefs/Home.html
index f1d273b..ca8241f 100644
--- a/html/RTIR/Prefs/Home.html
+++ b/html/RTIR/Prefs/Home.html
@@ -47,16 +47,16 @@ push @objs, RT::SavedSearch->new( $session{'CurrentUser'} )->_PrivacyObjects
 
 for my $object (@objs) {
     for ($m->comp("/Search/Elements/SearchesForObject", Object => $object)) {
-        my ($desc, $search) = @$_;
+        my ($desc, $loc_desc, $search) = @$_;
         my $SearchType = $search->Content->{'SearchType'} || 'Ticket';
         if ($object eq $sys && $SearchType eq 'Ticket') {
-            push @items, ["system-$desc", $desc];
+            push @items, ["system-$desc", $loc_desc];
         }
         else {
             my $oid = ref($object).'-'.$object->Id.'-SavedSearch-'.$search->Id;
             my $type = ($SearchType eq 'Ticket')
                 ? 'Saved Search' : $SearchType; # loc
-            push @items, ["saved-$oid", loc($type).": $desc"];
+            push @items, ["saved-$oid", loc($type).": $loc_desc"];
         }
     }
 }

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