[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-1073-gf0256a9

[Kevin Falcone]

The branch, 3.9-trunk has been updated
       via  f0256a98c82d25edaf54e8c2b6441e1c2019ec49 (commit)
      from  a64d936853d87ae98a3d0d207d94e01fb5b1ab71 (commit)

Summary of changes:
 etc/RT_Config.pm.in |    9 +--------
 lib/RT/Config.pm    |   23 +++++++++--------------
 t/i18n/caching.t    |    4 ++--
 3 files changed, 12 insertions(+), 24 deletions(-)

- Log -----------------------------------------------------------------
commit f0256a98c82d25edaf54e8c2b6441e1c2019ec49
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Dec 27 20:18:56 2010 -0500

    Remove ResolveDefaultUpdateType config option
    
    With Lifecycles, this isn't as easily hooked in.  It can now be changed
    on a site basis using lifecycles, but adding back the user-config
    portion is harder.

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 55043a4..74bf759 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -1372,17 +1372,10 @@ Set($SearchResultsRefreshInterval, 0);
 
 =item C<$ResolveDefaultUpdateType>
 
-Set the default Update Type when clicking the Resolve link in the Ticket
-links tab.
-
-  Comment            Comments (Not sent to requestors)
-  Respond            Reply to requestors
+This option has been deprecated.  You can configure this site-wide with L<%Lifecycles>
 
 =cut
 
-Set($ResolveDefaultUpdateType, 'Comment');
-
-
 =item C<$OldestTransactionsFirst>
 
 By default, RT shows newest transactions at the bottom of the ticket
diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index 019af51..9fa499f 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -273,20 +273,6 @@ our %META = (
             },  
         },  
     },
-    ResolveDefaultUpdateType => {
-        Section         => 'General',                                      #loc
-        Overridable     => 1,
-        SortOrder       => 10,
-        Widget          => '/Widgets/Form/Select',
-        WidgetArguments => {
-            Description => 'Default Update Type when Resolving',           #loc
-            Values      => [qw(Comment Respond)],
-            ValuesLabel => {
-                Comment => "Comments (Not sent to requestors)",            #loc
-                Respond => "Reply to requestors",                          #loc
-            },
-        },
-    },
 
     # User overridable options for RT at a glance
     DefaultSummaryRows => {
@@ -540,6 +526,15 @@ our %META = (
             }
         }
     },
+    ResolveDefaultUpdateType => {
+        PostLoadCheck => sub {
+            my $self  = shift;
+            my $value = shift;
+            return unless $value;
+            $RT::Logger->info('The ResolveDefaultUpdateType config option has been deprecated.  '.
+                              'You can change the site default in your %Lifecycles config.');
+        }
+    },
 );
 my %OPTIONS = ();
 
diff --git a/t/i18n/caching.t b/t/i18n/caching.t
index 024ef5b..466d6b1 100644
--- a/t/i18n/caching.t
+++ b/t/i18n/caching.t
@@ -18,12 +18,12 @@ use RT::Test;
 my ($baseurl, $m) = RT::Test->started_ok;
 $m->login( root => "password" );
 $m->get_ok('/Prefs/Other.html');
-$m->content_lacks('Commentaires','Lacks translated french');
+$m->content_lacks('Ne pas','Lacks translated french');
 $m->get_ok( "/NoAuth/Logout.html" );
 
 $m->login( french => "password" );
 $m->get_ok('/Prefs/Other.html');
-$m->content_contains('Commentaires','Has translated french');
+$m->content_contains('Ne pas','Has translated french');
 $m->get_ok( "/NoAuth/Logout.html" ); # ->logout fails because it's translated
 
 $m->login( root => "password" );

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