[Rt-commit] rt branch, 4.0/apply-scrips-to-multiple-queues, updated. rt-4.0.4-200-gb900a61
Ruslan Zakirov
ruz at bestpractical.com
Mon Jan 23 17:12:00 EST 2012
The branch, 4.0/apply-scrips-to-multiple-queues has been updated
via b900a61804d2d8a6a87023c4cc0006af199d42cc (commit)
via d2a4858884cb8dc0d4b0466ba07a20882c6fee12 (commit)
via 5e57e5b304a153e02bfb6839282c516da60b0119 (commit)
via 3be8540525d488b3853b1c252b9dd8ed6ba7c0ce (commit)
via 642ed6e863645a04820c6b3c7e0cba6b00ae31f7 (commit)
via 778f2fe59a3637729428d6ada4be8186058ce9ea (commit)
from 7d8e400e1cfcb47a7990272f3e151ff80d947b15 (commit)
Summary of changes:
etc/initialdata | 48 +++++++++++++++++-----------------
share/html/Admin/Scrips/Create.html | 2 +-
share/html/Elements/Tabs | 11 ++++++-
t/ticket/scrips_batch.t | 32 +++++++++++-----------
t/web/scrips.t | 12 ++++----
t/web/walk.t | 2 +-
6 files changed, 57 insertions(+), 50 deletions(-)
- Log -----------------------------------------------------------------
commit 778f2fe59a3637729428d6ada4be8186058ce9ea
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Tue Jan 24 00:57:58 2012 +0400
sort scrips in initialdata by description
this keeps new and upgraded installations on
the same page
diff --git a/etc/initialdata b/etc/initialdata
index 3da4a97..fddbb62 100755
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -511,14 +511,30 @@ Hour: { $SubscriptionObj->SubValue('Hour') }
);
@Scrips = (
+ { Description => 'On Comment Notify AdminCcs as Comment',
+ ScripCondition => 'On Comment',
+ ScripAction => 'Notify AdminCcs As Comment',
+ Template => 'Admin Comment' },
+ { Description => 'On Comment Notify Other Recipients as Comment',
+ ScripCondition => 'On Comment',
+ ScripAction => 'Notify Other Recipients As Comment',
+ Template => 'Correspondence' },
+ { Description => 'On Correspond Notify AdminCcs',
+ ScripCondition => 'On Correspond',
+ ScripAction => 'Notify AdminCcs',
+ Template => 'Admin Correspondence' },
+ { Description => 'On Correspond Notify Other Recipients',
+ ScripCondition => 'On Correspond',
+ ScripAction => 'Notify Other Recipients',
+ Template => 'Correspondence' },
+ { Description => 'On Correspond Notify Requestors and Ccs',
+ ScripCondition => 'On Correspond',
+ ScripAction => 'Notify Requestors And Ccs',
+ Template => 'Correspondence' },
{ Description => 'On Correspond Open Tickets',
ScripCondition => 'On Correspond',
ScripAction => 'Open Tickets',
Template => 'Blank' },
- { Description => 'On Owner Change Notify Owner',
- ScripCondition => 'On Owner Change',
- ScripAction => 'Notify Owner',
- Template => 'Transaction' },
{ Description => 'On Create Autoreply To Requestors',
ScripCondition => 'On Create',
ScripAction => 'AutoReply To Requestors',
@@ -527,26 +543,10 @@ Hour: { $SubscriptionObj->SubValue('Hour') }
ScripCondition => 'On Create',
ScripAction => 'Notify AdminCcs',
Template => 'Transaction' },
- { Description => 'On Correspond Notify AdminCcs',
- ScripCondition => 'On Correspond',
- ScripAction => 'Notify AdminCcs',
- Template => 'Admin Correspondence' },
- { Description => 'On Correspond Notify Requestors and Ccs',
- ScripCondition => 'On Correspond',
- ScripAction => 'Notify Requestors And Ccs',
- Template => 'Correspondence' },
- { Description => 'On Correspond Notify Other Recipients',
- ScripCondition => 'On Correspond',
- ScripAction => 'Notify Other Recipients',
- Template => 'Correspondence' },
- { Description => 'On Comment Notify AdminCcs as Comment',
- ScripCondition => 'On Comment',
- ScripAction => 'Notify AdminCcs As Comment',
- Template => 'Admin Comment' },
- { Description => 'On Comment Notify Other Recipients as Comment',
- ScripCondition => 'On Comment',
- ScripAction => 'Notify Other Recipients As Comment',
- Template => 'Correspondence' },
+ { Description => 'On Owner Change Notify Owner',
+ ScripCondition => 'On Owner Change',
+ ScripAction => 'Notify Owner',
+ Template => 'Transaction' },
{ Description => 'On Resolve Notify Requestors',
ScripCondition => 'On Resolve',
ScripAction => 'Notify Requestors',
commit 642ed6e863645a04820c6b3c7e0cba6b00ae31f7
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Tue Jan 24 00:59:57 2012 +0400
fix Scrip's tabs
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 724ba0e..e69aa9d 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -350,12 +350,19 @@ my $build_admin_menu = sub {
}
}
- if ( $request_path =~ m{^/Admin/Global/(Scrip|Template)s?\.html} ) {
+ if ( $request_path =~ m{^/Admin/Global/Scrips\.html} ) {
+ my $tabs = PageMenu();
+ $tabs->child( select => title => loc('Select'),
+ path => "/Admin/Global/Scrips.html" );
+ $tabs->child( create => title => loc('Create'),
+ path => "/Admin/Scrips/Create.html" );
+ }
+
+ if ( $request_path =~ m{^/Admin/Global/(Template)s?\.html} ) {
my $type = $1;
my $tabs = PageMenu();
my %labels = (
- Scrip => loc('Scrips'),
Template => loc('Templates')
);
commit 3be8540525d488b3853b1c252b9dd8ed6ba7c0ce
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Tue Jan 24 01:00:38 2012 +0400
fix walk.t, page has been moved
diff --git a/t/web/walk.t b/t/web/walk.t
index 34fab14..1ea7cfb 100644
--- a/t/web/walk.t
+++ b/t/web/walk.t
@@ -54,7 +54,7 @@ my @links = (
'/Admin/Groups/Modify.html?id=' . $group->id,
'/Admin/Queues/Modify.html?id=' . $queue->id,
'/Admin/CustomFields/Modify.html?id=' . $cf->id,
- '/Admin/Global/Scrip.html?id=1',
+ '/Admin/Scrips/Modify.html?id=1',
'/Admin/Global/Template.html?Template=1',
'/Admin/Articles/Classes/Modify.html?id=' . $class->id,
'/Search/Build.html?Query=id<10',
commit 5e57e5b304a153e02bfb6839282c516da60b0119
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Tue Jan 24 01:22:53 2012 +0400
fix tests, we changed admin UI for scrips
diff --git a/t/web/scrips.t b/t/web/scrips.t
index def20ec..7d18a50 100644
--- a/t/web/scrips.t
+++ b/t/web/scrips.t
@@ -51,14 +51,14 @@ sub prepare_code_with_value {
diag "Create Scrip (Cond #$condition)" if $ENV{TEST_VERBOSE};
$m->follow_link_ok({id => 'tools-config-global-scrips-create'});
my $prepare_code = prepare_code_with_value($prepare_code_value);
- $m->form_name('ModifyScrip');
+ $m->form_name('CreateScrip');
$m->set_fields(
- 'Scrip-new-ScripCondition' => $condition,
- 'Scrip-new-ScripAction' => 15, # User Defined
- 'Scrip-new-Template' => 1, # Blank
- 'Scrip-new-CustomPrepareCode' => $prepare_code,
+ 'ScripCondition' => $condition,
+ 'ScripAction' => 15, # User Defined
+ 'Template' => 1, # Blank
+ 'CustomPrepareCode' => $prepare_code,
);
- $m->submit;
+ $m->click('Create');
}
my $ticket_obj = RT::Test->create_ticket(
commit d2a4858884cb8dc0d4b0466ba07a20882c6fee12
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Tue Jan 24 02:03:58 2012 +0400
we have to pass queue obj as it's expected
diff --git a/share/html/Admin/Scrips/Create.html b/share/html/Admin/Scrips/Create.html
index 732997d..768cb92 100644
--- a/share/html/Admin/Scrips/Create.html
+++ b/share/html/Admin/Scrips/Create.html
@@ -8,7 +8,7 @@
<&| /Widgets/TitleBox, title => loc('Basics') &>
<table>
-<& Elements/EditBasics, %ARGS, Scrip => $scrip &>
+<& Elements/EditBasics, %ARGS, Scrip => $scrip, Queue => $queue_obj &>
<tr><td class="label"><&|/l&>Stage</&>:</td><td class="value">\
<& /Admin/Elements/SelectStage, Default => $ARGS{"Stage"} &></td></tr>
commit b900a61804d2d8a6a87023c4cc0006af199d42cc
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Tue Jan 24 02:04:58 2012 +0400
update tests acording to recent UI changes
diff --git a/t/ticket/scrips_batch.t b/t/ticket/scrips_batch.t
index a6d22b5..625eabe 100644
--- a/t/ticket/scrips_batch.t
+++ b/t/ticket/scrips_batch.t
@@ -19,24 +19,24 @@ my $sid;
$m->follow_link_ok( { id => 'tools-config-queues' } );
$m->follow_link_ok( { text => $queue->Name } );
$m->follow_link_ok( { id => 'page-scrips-create'});
- $m->form_name('ModifyScrip');
- $m->field('Scrip-new-Description' => 'test');
- $m->select('Scrip-new-ScripCondition' => 'On Transaction');
- $m->select('Scrip-new-ScripAction' => 'User Defined');
- $m->select('Scrip-new-Template' => 'Global template: Blank');
- $m->select('Scrip-new-Stage' => 'TransactionBatch');
- $m->field('Scrip-new-CustomPrepareCode' => 'return 1;');
- $m->field('Scrip-new-CustomCommitCode' => 'return 1;');
- $m->submit;
- $m->content_contains("Scrip Created");
+ $m->form_name('CreateScrip');
+ $m->field('Description' => 'test');
+ $m->select('ScripCondition' => 'On Transaction');
+ $m->select('ScripAction' => 'User Defined');
+ $m->select('Template' => 'Blank');
+ $m->select('Stage' => 'Batch');
+ $m->field('CustomPrepareCode' => 'return 1;');
+ $m->field('CustomCommitCode' => 'return 1;');
+ $m->click('Create');
+ $m->content_contains("Scrip Created");
my $form = $m->form_name('ModifyScrip');
$sid = $form->value('id');
- is $m->value("Scrip-$sid-Description"), 'test', 'correct description';
- is value_name($form, "Scrip-$sid-ScripCondition"), 'On Transaction', 'correct condition';
- is value_name($form, "Scrip-$sid-ScripAction"), 'User Defined', 'correct action';
- is value_name($form, "Scrip-$sid-Template"), 'Global template: Blank', 'correct template';
+ is $m->value("Description"), 'test', 'correct description';
+ is value_name($form, "ScripCondition"), 'On Transaction', 'correct condition';
+ is value_name($form, "ScripAction"), 'User Defined', 'correct action';
+ is value_name($form, "Template"), 'Blank', 'correct template';
{
my $rec = RT::ObjectScrip->new( RT->SystemUser );
@@ -61,8 +61,8 @@ foreach my \$txn ( \@\$batch ) {
return 1;
END
- $m->field( "Scrip-$sid-CustomCommitCode" => $code );
- $m->submit;
+ $m->field( "CustomCommitCode" => $code );
+ $m->click('Update');
$m->goto_create_ticket( $queue );
$m->form_name('TicketCreate');
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list