Commit 4e7da66f authored by Kevin Falcone's avatar Kevin Falcone
Browse files

Merge branch '3.0.1-releng' into 3.0-trunk

parents 97a2444a ff42093c
......@@ -32,4 +32,4 @@ requires:
perl: 5.8.3
resources:
license: http://opensource.org/licenses/gpl-license.php
version: 3.0.1rc1
version: 3.0.HEAD
......@@ -20,8 +20,8 @@ improve the performance of the upgrade.
CREATE INDEX UPGRADE_TRANSACTIONS_NEW ON Transactions(Field,ObjectType, Type, NewReference);
CREATE INDEX UPGRADE_TRANSACTIONS_OLD on Transactions(Field,ObjectType, Type, OldReference);
These should be removed following a successful since they are unlikely
to be useful in normal RTIR usage.
These should be removed following a successful upgrade since they are
unlikely to be useful in normal RTIR usage.
DROP INDEX UPGRADE_TRANSACTIONS_TYPE ON Transactions;
DROP INDEX UPGRADE_TRANSACTIONS_NEW ON Transactions;
......
......@@ -74,6 +74,8 @@
<&| /Widgets/TitleBox, contentbg => "#cccccc", title => loc("Identify Recipients") &>
<table border="0" cellpadding="0" cellspacing="2">
% my $height = RT->Config->Get('MessageBoxHeight', $session{'CurrentUser'} ) || 15;
% my $wrap = RT->Config->Get('MessageBoxWrap', $session{'CurrentUser'} ) || 'SOFT';
% if ($loop eq 'IP') {
<tr>
<td class="label">WHOIS:</td>
......@@ -90,22 +92,14 @@
<&|/l&>IP Addresses</&>:<br /><small>arg: <i>_IP_</i></small>
</td>
<td class="value">
% if (exists $ARGS{IPs}) {
<& /Elements/MessageBox, Name=>"IPs", Width => 30, Default=>$ARGS{IPs}, IncludeSignature => 0, %ARGS&>
% } else {
<& /Elements/MessageBox, Name=> 'IPs', Width => 30, IncludeSignature => 0 &>
% }
<textarea autocomplete="off" cols="30" rows="<% $height %>" wrap="<% $wrap %>" name="IPs" id="IPs"><% $ARGS{IPs} || '' %></textarea>
</td>
</tr>
% } else {
<tr>
<td class="label"><&|/l&>Addresses</&>:<br /><small>arg: <i>_ADDR_</i></small></td>
<td class="value">
% if (exists $ARGS{Addresses}) {
<& /Elements/MessageBox, Name=>"Addresses", Width => 30, Default=>$ARGS{Addresses}, IncludeSignature => 0, %ARGS&>
% } else {
<& /Elements/MessageBox, Name=> 'Addresses', Width => 30, IncludeSignature => 0 &>
% }
<textarea autocomplete="off" cols="30" rows="<% $height %>" wrap="<% $wrap %>" name="Addresses" id="Addresses"><% $ARGS{Addresses} || '' %></textarea>
</td>
</tr>
% }
......
......@@ -8,7 +8,7 @@ no warnings 'once';
use Module::Install::Base;
use base 'Module::Install::Base';
our $VERSION = '0.32_01';
our $VERSION = '0.33';
use FindBin;
use File::Glob ();
......@@ -136,7 +136,9 @@ install ::
$has_etc{acl}++;
}
if ( -e 'etc/initialdata' ) { $has_etc{initialdata}++; }
if ( -d 'etc/upgrade/' ) { $has_etc{upgrade}++; }
if ( grep { /\d+\.\d+\.\d+.*$/ } glob('etc/upgrade/*.*.*') ) {
$has_etc{upgrade}++;
}
$self->postamble("$postamble\n");
unless ( $subdirs{'lib'} ) {
......@@ -191,7 +193,7 @@ sub requires_rt {
sub rt_too_new {
my ($self,$version,$msg) = @_;
$msg ||= "Your version %s is too new, this extension requires a release of RT older than %s";
$msg ||= "Your version %s is too new, this extension requires a release of RT older than %s\n";
_load_rt_handle();
my @sorted = sort RT::Handle::cmp_version $version,$RT::VERSION;
......@@ -220,4 +222,4 @@ sub _load_rt_handle {
__END__
#line 360
#line 362
......@@ -52,7 +52,7 @@ use warnings;
package RT::IR;
our $VERSION = '3.0.1rc1';
our $VERSION = '3.0.HEAD';
use Scalar::Util qw(blessed);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment