[Rt-commit] rt branch, 4.2/cf-page-menu-in-queue-admin, created. rt-4.1.8-573-g1b689fa

[Ruslan Zakirov]

The branch, 4.2/cf-page-menu-in-queue-admin has been created
        at  1b689fa235672e63273298354c6fe6619a853812 (commit)

- Log -----------------------------------------------------------------
commit 1b689fa235672e63273298354c6fe6619a853812
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Jun 13 17:12:14 2013 +0400

    CF tabs in Queues' admin interface
    
    Put "Ticket Custom Fields" and "Transaction Custom Fields" page
    tabs under one "Custom Fields" tab. Page tabs were just two wide,
    so in some translations it could quickly become two line instead
    of usual one and hide content.
    
    Top "Custom Fields" tab is not linked as I feel that for a queue
    it should link to a list of queue's custom fields, but we don't
    have such page as these custom fields are global. Linking to
    Global -> Custom Fields -> Queues is an option, but I decided
    not to go there.

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 9595c65..1205819 100644
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -297,10 +297,11 @@ my $build_admin_menu = sub {
                 $scrips->child( select => title => loc('Select'), path => "/Admin/Queues/Scrips.html?id=" . $id );
                 $scrips->child( create => title => loc('Create'), path => "/Admin/Scrips/Create.html?Queue=" . $id);
 
-                my $ticket_cfs = $queue->child( 'ticket-custom-fields' => title => loc('Ticket Custom Fields'),
+                my $cfs = $queue->child( 'custom-fields' => title => loc('Custom Fields') );
+                my $ticket_cfs = $cfs->child( 'tickets' => title => loc('Tickets'),
                     path => '/Admin/Queues/CustomFields.html?SubType=RT::Ticket&id=' . $id );
 
-                my $txn_cfs = $queue->child( 'transaction-custom-fields' => title => loc('Transaction Custom Fields'),
+                my $txn_cfs = $cfs->child( 'transactions' => title => loc('Transactions'),
                     path => '/Admin/Queues/CustomFields.html?SubType=RT::Ticket-RT::Transaction&id='.$id );
 
                 $queue->child( 'group-rights' => title => loc('Group Rights'), path => "/Admin/Queues/GroupRights.html?id=".$id );
diff --git a/t/customfields/sort_order.t b/t/customfields/sort_order.t
index ba0b654..24e047e 100644
--- a/t/customfields/sort_order.t
+++ b/t/customfields/sort_order.t
@@ -50,7 +50,7 @@ diag "reorder CFs: C, A and B";
 {
     $m->get( '/Admin/Queues/' );
     $m->follow_link_ok( {text => $queue->id} );
-    $m->follow_link_ok( {id  => 'page-ticket-custom-fields'} );
+    $m->follow_link_ok( {id  => 'page-custom-fields-tickets'} );
     my @tmp = ($m->content =~ /(CF [ABC])/g);
     is_deeply(\@tmp, ['CF B', 'CF A', 'CF C']);
 
diff --git a/t/web/cf_access.t b/t/web/cf_access.t
index 5cc9d38..48ab5a2 100644
--- a/t/web/cf_access.t
+++ b/t/web/cf_access.t
@@ -97,7 +97,7 @@ my ( $cf, $cfid, $tid );
     $m->follow_link( id => 'admin-queues');
     $m->follow_link( text => 'General' );
     $m->title_is(q/Configuration for queue General/, 'admin-queue: general');
-    $m->follow_link( id => 'page-ticket-custom-fields');
+    $m->follow_link( id => 'page-custom-fields-tickets');
     $m->title_is(q/Custom Fields for queue General/, 'admin-queue: general cfid');
     $m->form_name('EditCustomFields');
 
diff --git a/t/web/cf_date.t b/t/web/cf_date.t
index 9b892d0..65f24d3 100644
--- a/t/web/cf_date.t
+++ b/t/web/cf_date.t
@@ -38,7 +38,7 @@ ok $queue && $queue->id, 'loaded or created queue';
     $m->follow_link( text => 'General' );
     $m->title_is( q/Configuration for queue General/,
         'admin-queue: general' );
-    $m->follow_link( text => 'Ticket Custom Fields' );
+    $m->follow_link( id => 'page-custom-fields-tickets' );
     $m->title_is( q/Custom Fields for queue General/,
         'admin-queue: general cfid' );
 
diff --git a/t/web/cf_datetime.t b/t/web/cf_datetime.t
index 02fa39e..e84e66b 100644
--- a/t/web/cf_datetime.t
+++ b/t/web/cf_datetime.t
@@ -47,7 +47,7 @@ ok $queue && $queue->id, 'loaded or created queue';
     $m->title_is(q/Admin queues/, 'admin-queues screen');
     $m->follow_link( text => 'General' );
     $m->title_is(q/Configuration for queue General/, 'admin-queue: general');
-    $m->follow_link( text => 'Ticket Custom Fields' );
+    $m->follow_link( id => 'page-custom-fields-tickets' );
     $m->title_is(q/Custom Fields for queue General/, 'admin-queue: general cfid');
 
     $m->form_name('EditCustomFields');
diff --git a/t/web/cf_select_one.t b/t/web/cf_select_one.t
index 3d45d3e..4f81e2a 100644
--- a/t/web/cf_select_one.t
+++ b/t/web/cf_select_one.t
@@ -52,7 +52,7 @@ diag "apply the CF to General queue";
     $m->follow_link( id => 'admin-queues');
     $m->follow_link( text => 'General' );
     $m->title_is(q/Configuration for queue General/, 'admin-queue: general');
-    $m->follow_link( id => 'page-ticket-custom-fields');
+    $m->follow_link( id => 'page-custom-fields-tickets');
     $m->title_is(q/Custom Fields for queue General/, 'admin-queue: general cfid');
 
     $m->form_name('EditCustomFields');

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