[Rt-commit] rtir branch, 2.5-greenville, updated. db4f6c52bd9177a45221b6324e1700171862f61c
Kevin Falcone
falcone at bestpractical.com
Wed Sep 16 09:18:41 EDT 2009
The branch, 2.5-greenville has been updated
via db4f6c52bd9177a45221b6324e1700171862f61c (commit)
via 9942eb1711650ce0d87d3525c083606b7040a967 (commit)
via 29cc9023eca81f31223bd2bb5b4e8aabfc1ec0fa (commit)
via 170995a6efe3fd1c71bb478d519a2e80c804e3b5 (commit)
via 46806a3899346de1b3b1b7ce7f16f74dcde3d479 (commit)
via d9fc445c8438a5485b689d994091816bbf8379f2 (commit)
via bcc4c1a3163b06d02590e33e2f3cfda1ea933acc (commit)
via 3507a17a6ecc17b4ee8584efcb8c46de5539daaf (commit)
via 856970fc6a360c29f4aed6f755027506f213c4b8 (commit)
via 0ff21da2eddfaf113d91ceb005465a8809e13988 (commit)
via 382e189a5f12e1ad19ade9b8beafdf8a2a1f2eac (commit)
via a6f3a531778f0a0ebddc75f39cdcb9bd4af40854 (commit)
via d56e450e478a04971c9996d4b06f0d38a191d167 (commit)
via 0c4e1961ea7b13defd2a637a95b338801e8338e2 (commit)
via 1ab67f22b9783cf608106dd00cbc6c6a24e628b2 (commit)
via c69f53d1bfb8722aac56c182bc378ad9c066eab1 (commit)
via b28be7b1755122488ad8204a11af2ff4c21c2e9b (commit)
via d6ee1f579b6262688fdf3e238a10d2d401333237 (commit)
via d6798a20bd7f3679e485013b14b15df454e7c6bf (commit)
via 4409ea82125517e22e362a56f4fcfd5b6ee5cfe0 (commit)
via f9b124d3eb09fb016b8592ac16d0e1f7f1d7b0ab (commit)
via 58f07ba64ab439630fbd144fb1fa508a3b523804 (commit)
via 29f9f2b2d2e6dd875e091d2e51334b77080f1c4b (commit)
from 06c7177d15e6269061f617af8d78f248aa316946 (commit)
Summary of changes:
META.yml | 2 +-
Makefile.PL | 2 +-
html/RTIR/Create.html | 36 +++++++++++---------
html/RTIR/Display.html | 5 ++-
html/RTIR/Edit.html | 6 +--
html/RTIR/Elements/MergeWith | 3 +-
html/RTIR/Incident/Create.html | 11 +++++-
html/RTIR/Incident/Display.html | 5 ++-
html/RTIR/Incident/Edit.html | 5 +--
html/RTIR/Investigation/Elements/Create | 10 -----
html/RTIR/index.html | 8 ++++-
inc/Module/Install/RTx.pm | 11 +++++-
inc/Module/Install/RTx/Factory.pm | 2 +-
lib/RT/Action/RTIR_SetConstituency.pm | 5 ++-
lib/RT/Condition/RTIR_RequireConstituencyChange.pm | 17 ++++-----
.../RTIR_RequireConstituencyGroupChange.pm | 19 ++++------
lib/RT/IR.pm | 6 ++--
17 files changed, 83 insertions(+), 70 deletions(-)
- Log -----------------------------------------------------------------
commit 0c4e1961ea7b13defd2a637a95b338801e8338e2
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Tue Sep 1 20:07:52 2009 +0400
bump version, 2.5.4
diff --git a/META.yml b/META.yml
index bdf5936..0eec2ec 100644
--- a/META.yml
+++ b/META.yml
@@ -33,4 +33,4 @@ requires:
Regexp::Common: 0
Regexp::Common::net::CIDR: 0
perl: 5.8.3
-version: 2.5.3
+version: 2.5.4
diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index edeb361..1259f80 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -46,7 +46,7 @@
#
package RT::IR;
-our $VERSION = '2.5.3';
+our $VERSION = '2.5.4';
use 5.008003;
use warnings;
commit d56e450e478a04971c9996d4b06f0d38a191d167
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Sep 4 01:58:42 2009 +0400
use hint on the right like for other fields and add more text
diff --git a/html/RTIR/Create.html b/html/RTIR/Create.html
index bcd23bd..18c85ca 100644
--- a/html/RTIR/Create.html
+++ b/html/RTIR/Create.html
@@ -91,8 +91,11 @@
% }
% } else {
<tr>
- <td class="label"><&|/l&>Incident</&><% $Type eq 'Block'? loc('(required)'): '' %>:</td>
- <td class="value" colspan="2"><input name="Incident" size="16" maxsize="16" value="<% $Incident || '' %>" /></td>
+ <td class="label"><&|/l&>Incident</&>:</td>
+ <td class="value"><input name="Incident" size="16" maxsize="16" value="<% $Incident || '' %>" /></td>
+ <td><i><font size="-2">
+ (<&|/l&>Id of an Incident to link a new ticket to</&>. <% $Type eq 'Block'? '<strong>'.loc('Required').'</strong>': loc('Optional') |n %>.)
+ </font></i></td>
</tr>
% }
<tr>
commit a6f3a531778f0a0ebddc75f39cdcb9bd4af40854
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Sep 4 01:59:38 2009 +0400
* use more classes to make form look consistent
diff --git a/html/RTIR/Create.html b/html/RTIR/Create.html
index 18c85ca..9e3ecf4 100644
--- a/html/RTIR/Create.html
+++ b/html/RTIR/Create.html
@@ -85,7 +85,7 @@
</tr>
% if ( $parentvalue ) {
<tr>
- <td align="right"><&|/l&>Will be linked to Incident(s):</&></td>
+ <td align="right"><&|/l&>Will be linked to Incident(s)</&>:</td>
<td colspan="2"><% $parentvalue %></td>
</tr>
% }
@@ -114,12 +114,12 @@
</td>
</tr>
<tr>
- <td align="right"><&|/l&>Time Worked</&>:</td>
+ <td align="right" class="label"><&|/l&>Time Worked</&>:</td>
<td colspan="2">
<table>
<tr>
<td><input size="3" name="TimeWorked" value="<% $ARGS{'TimeWorked'} || '' %>" /></td>
- <td align="right"><&|/l&>Time Left</&>:</td>
+ <td align="right" class="label"><&|/l&>Time Left</&>:</td>
<td><input size="3" name="TimeLeft" value="<% $ARGS{'TimeLeft'} || '' %>" /></td>
</tr>
</table>
@@ -127,8 +127,8 @@
</tr>
<tr>
<td class="label"><&|/l&>Correspondents</&>:</td>
- <td><input name="Requestors" value="<% $ARGS{'Requestors'} || '' %>" size="40" /></td>
- <td>
+ <td class="value"><input name="Requestors" value="<% $ARGS{'Requestors'} || '' %>" size="40" /></td>
+ <td class="label">
<input type="checkbox" name="SkipNotification" value="Requestors" <% (grep $_ eq 'Requestors', @SkipNotification)? 'checked': '' %> />
<&|/l&>Don't send any emails to correspondents.</&>
</td>
commit 382e189a5f12e1ad19ade9b8beafdf8a2a1f2eac
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Sep 4 22:26:59 2009 +0400
Customer is not mandatory custom field anymore
diff --git a/html/RTIR/Investigation/Elements/Create b/html/RTIR/Investigation/Elements/Create
index ceb4508..06e1b31 100644
--- a/html/RTIR/Investigation/Elements/Create
+++ b/html/RTIR/Investigation/Elements/Create
@@ -51,16 +51,6 @@ email addresses. These people <b>will</b> receive future updates.)</&></font></i
</td></tr>
% }
-% unless ( $SkipField{'Customer'} ) {
-<tr><td class="label"><&|/l&>Customer</&>:</td>
-<td class="value"><& /RTIR/Elements/EditRTIRField,
- NamePrefix => $NamePrefix,
- QueueObj => $QueueObj,
- Name => 'Customer',
-&></td></tr>
-% }
-
-
% if ( $QueueObj || $ARGS{'TicketObj'} ) {
% unless ( $SkipField{'CustomFields'} ) {
<tr><td colspan="2"><& /Ticket/Elements/EditCustomFields,
commit 0ff21da2eddfaf113d91ceb005465a8809e13988
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 856970fc6a360c29f4aed6f755027506f213c4b8
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 3507a17a6ecc17b4ee8584efcb8c46de5539daaf
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 bcc4c1a3163b06d02590e33e2f3cfda1ea933acc
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" => ''
commit 9942eb1711650ce0d87d3525c083606b7040a967
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Wed Sep 16 09:14:07 2009 -0400
Revert "If Constituency isn't valid for the ticket, don't show it in the Edit page"
This reverts commit eaa53cef6817a0359ae4c2bd1b095af555fe599b.
Ruz implemented this more cleanly on trunk
diff --git a/html/RTIR/Edit.html b/html/RTIR/Edit.html
index dbaf935..74915ac 100644
--- a/html/RTIR/Edit.html
+++ b/html/RTIR/Edit.html
@@ -79,7 +79,7 @@
<td class="label"><&|/l&>Time Worked</&>:</td>
<td class="value"><input name="TimeWorked" value="<%$Ticket->TimeWorked|h%>" size="5" /></td>
</tr>
-% if ( ($constituency_propagation ne 'reject' || !$has_parent) && $HasConstituency->First ) {
+% if ( $constituency_propagation ne 'reject' || !$has_parent ) {
<tr>
<td class="labeltop"><&|/l&>Constituency</&>:</td>
<td class="value">
@@ -166,9 +166,6 @@ if ( $constituency_propagation eq 'reject' ) {
$has_parent = $tickets->First ? 1 : 0;
}
-my $HasConstituency = $Ticket->CustomFields;
-$HasConstituency->Limit(FIELD => 'Name', VALUE => 'Constituency');
-
if ( $SaveChanges && !$OnlySearchForPeople ) {
my $checks_failure = 0;
my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $Ticket, 'State' );
diff --git a/html/RTIR/Incident/Edit.html b/html/RTIR/Incident/Edit.html
index 8c27e0b..4ad10d9 100644
--- a/html/RTIR/Incident/Edit.html
+++ b/html/RTIR/Incident/Edit.html
@@ -69,7 +69,7 @@
<td class="label"><&|/l&>Time Worked</&>:</td>
<td class="value"><input name="TimeWorked" value="<%$Ticket->TimeWorked|h%>" size="5" /></td>
</tr>
-% if ( ($constituency_propagation ne 'reject' || !$has_children) && $HasConstituency->First ) {
+% if ( $constituency_propagation ne 'reject' || !$has_children ) {
<tr>
<td class="label"><&|/l&>Constituency</&>:</td>
<td class="value">
@@ -137,9 +137,6 @@ if ( $constituency_propagation eq 'reject' ) {
$has_children = $tickets->First ? 1 : 0;
}
-my $HasConstituency = $Ticket->CustomFields;
-$HasConstituency->Limit(FIELD => 'Name', VALUE => 'Constituency');
-
my @results;
if ( $SaveChanges && !$OnlySearchForPeople ) {
my $checks_failure = 0;
commit db4f6c52bd9177a45221b6324e1700171862f61c
Merge: 9942eb1 29cc902
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Wed Sep 16 09:15:04 2009 -0400
Merge branch '2.5-trunk' into 2.5-greenville
Conflicts:
META.yml
lib/RT/IR.pm
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list