[Rt-commit] rt branch, 4.2/admin-formatting-columnmap, created. rt-4.2.5-22-g6524587

Alex Vandiver alexmv at bestpractical.com
Mon Jun 16 14:47:21 EDT 2014


The branch, 4.2/admin-formatting-columnmap has been created
        at  6524587521c33b8cf718f48e411fb8b1c7bc0337 (commit)

- Log -----------------------------------------------------------------
commit fdc76d65fffb9640a64542c95330753db4c32ad7
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Jun 13 12:40:02 2014 +0200

    bring the queues filter to the top of the page
    
    If you have many queues this avoids scrolling to the bottom.
    This also brings the queues page in parity with users and groups.

diff --git a/share/html/Admin/Queues/index.html b/share/html/Admin/Queues/index.html
index 2957465..23238ff 100644
--- a/share/html/Admin/Queues/index.html
+++ b/share/html/Admin/Queues/index.html
@@ -51,24 +51,7 @@
 
 
 <h1><%$caption%></h1>
-<p><&|/l&>Select a queue</&>:</p>
-% unless ( $queues->Count ) {
-<em><&|/l&>No queues matching search criteria found.</&></em>
-% } else {
-<& /Elements/CollectionList,
-    OrderBy => 'Name',
-    Order => 'ASC',
-    Rows => 50,
-    %ARGS,
-    Format => $Format,
-    Collection => $queues,
-    AllowSorting => 1,
-    PassArguments => [qw(
-        Format Rows Page Order OrderBy
-        FindDisabledQueues QueueString QueueOp QueueField
-    )],
-&>
-% }
+
 <form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Queues/index.html">
 % foreach my $field( qw(Format Rows Page Order OrderBy) ) {
 %     next unless defined $ARGS{ $field } && length $ARGS{ $field };
@@ -89,6 +72,25 @@
 <div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div> 
 </form>
 
+<p><&|/l&>Select a queue</&>:</p>
+% unless ( $queues->Count ) {
+<em><&|/l&>No queues matching search criteria found.</&></em>
+% } else {
+<& /Elements/CollectionList,
+    OrderBy => 'Name',
+    Order => 'ASC',
+    Rows => 50,
+    %ARGS,
+    Format => $Format,
+    Collection => $queues,
+    AllowSorting => 1,
+    PassArguments => [qw(
+        Format Rows Page Order OrderBy
+        FindDisabledQueues QueueString QueueOp QueueField
+    )],
+&>
+% }
+
 <%INIT>
 my $queues = RT::Queues->new($session{'CurrentUser'});
 $queues->FindAllRows if $FindDisabledQueues;

commit efc9da268e2aa364f4e1975d8396f7758bf67871
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Jun 13 12:48:34 2014 +0200

    use LIKE as the default operator for the queue filter
    
    This simplifies searching for queues and brings this in parity with the users
    and groups filter.

diff --git a/share/html/Admin/Queues/index.html b/share/html/Admin/Queues/index.html
index 23238ff..9906490 100644
--- a/share/html/Admin/Queues/index.html
+++ b/share/html/Admin/Queues/index.html
@@ -122,6 +122,6 @@ $FindDisabledQueues => 0
 $Format             => undef
 
 $QueueField         => 'Name'
-$QueueOp            => '='
+$QueueOp            => 'LIKE'
 $QueueString        => ''
 </%ARGS>

commit cc1a55aa9d666142399a2960b50b941db81cdbda
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Jun 13 12:58:03 2014 +0200

    add SubjectTag to AdminSearchResultFormat for queues

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 23061fe..240adf6 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2943,7 +2943,7 @@ Set(%AdminSearchResultFormat,
     Queues =>
         q{'<a href="__WebPath__/Admin/Queues/Modify.html?id=__id__">__id__</a>/TITLE:#'}
         .q{,'<a href="__WebPath__/Admin/Queues/Modify.html?id=__id__">__Name__</a>/TITLE:Name'}
-        .q{,__Description__,__Address__,__Priority__,__DefaultDueIn__,__Disabled__,__Lifecycle__},
+        .q{,__Description__,__Address__,__Priority__,__DefaultDueIn__,__Disabled__,__Lifecycle__,__SubjectTag__},
 
     Groups =>
         q{'<a href="__WebPath__/Admin/Groups/Modify.html?id=__id__">__id__</a>/TITLE:#'}

commit 664d875042ed93ed7d6d2596921aed5aada00062
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Jun 13 12:59:25 2014 +0200

    enable filter queues by Lifecycle and SubjectTag

diff --git a/share/html/Admin/Queues/index.html b/share/html/Admin/Queues/index.html
index 9906490..f176cb7 100644
--- a/share/html/Admin/Queues/index.html
+++ b/share/html/Admin/Queues/index.html
@@ -59,7 +59,7 @@
 % }
 
 <select name="QueueField">
-% foreach my $col (qw(Name Description CorrespondAddress CommentAddress InitialPriority FinalPriority DefaultDueIn)) {
+% foreach my $col (qw(Name Description CorrespondAddress CommentAddress InitialPriority FinalPriority DefaultDueIn Lifecycle SubjectTag)) {
 <option <% $QueueField eq $col ? 'selected="selected"' : '' |n %> value="<% $col %>"><% loc($col) %></option>
 % }
 </select>

commit edf57288e9306ee8eb0e06c6ce147d1ea41cbec3
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Jun 13 13:03:58 2014 +0200

    whitespace and newline cleanup

diff --git a/share/html/Admin/Queues/index.html b/share/html/Admin/Queues/index.html
index f176cb7..8bfb691 100644
--- a/share/html/Admin/Queues/index.html
+++ b/share/html/Admin/Queues/index.html
@@ -48,8 +48,6 @@
 <& /Admin/Elements/Header, Title => loc("Admin queues") &>
 <& /Elements/Tabs &>
 
-
-
 <h1><%$caption%></h1>
 
 <form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Queues/index.html">
@@ -69,7 +67,7 @@
 
 <input type="checkbox" class="checkbox" id="FindDisabledQueues" name="FindDisabledQueues" value="1" <% $FindDisabledQueues? 'checked="checked"': '' |n%> />
 <label for="FindDisabledQueues"><&|/l&>Include disabled queues in listing.</&></label>
-<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div> 
+<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div>
 </form>
 
 <p><&|/l&>Select a queue</&>:</p>

commit b81d1ba6611d9104444e5a3a643b77c967a7a41d
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Jun 13 13:09:29 2014 +0200

    bring the customfields filter to the top of the page
    
    If you have many customfields this avoids scrolling to the bottom.
    This also brings the customfields page in parity with users and groups.

diff --git a/share/html/Admin/CustomFields/index.html b/share/html/Admin/CustomFields/index.html
index 845e863..a675639 100644
--- a/share/html/Admin/CustomFields/index.html
+++ b/share/html/Admin/CustomFields/index.html
@@ -53,21 +53,6 @@
 <h2><% loc("Custom Fields for [_1]", $tmp->FriendlyLookupType( $Type )) %></h2>
 % }
 
-<& /Elements/CollectionList,
-    OrderBy       => 'LookupType|Name',
-    Order         => 'ASC|ASC',
-    Rows          => 50,
-    %ARGS,
-    Collection    => $CustomFields,
-    Format        => $Format,
-    DisplayFormat => ($Type? '' : '__FriendlyLookupType__,'). $Format,
-    AllowSorting  => 1,
-    PassArguments => [
-        qw(Format Rows Page Order OrderBy),
-        qw(Type ShowDisabled)
-    ],
-&>
-
 <form action="<%RT->Config->Get('WebPath')%>/Admin/CustomFields/index.html" method="get">
 <&|/l&>Only show custom fields for:</&>
 <select name="Type">
@@ -86,6 +71,21 @@
 <input type="submit" value="<% loc('Go!') %>" />
 </form>
 
+<& /Elements/CollectionList,
+    OrderBy       => 'LookupType|Name',
+    Order         => 'ASC|ASC',
+    Rows          => 50,
+    %ARGS,
+    Collection    => $CustomFields,
+    Format        => $Format,
+    DisplayFormat => ($Type? '' : '__FriendlyLookupType__,'). $Format,
+    AllowSorting  => 1,
+    PassArguments => [
+        qw(Format Rows Page Order OrderBy),
+        qw(Type ShowDisabled)
+    ],
+&>
+
 <%args>
 $Type => ''
 $ShowDisabled => 0

commit cbe54121cecea69aa3511804294b9b77aa958bf9
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Jun 13 13:15:22 2014 +0200

    align the submit button to the right

diff --git a/share/html/Admin/CustomFields/index.html b/share/html/Admin/CustomFields/index.html
index a675639..e67b762 100644
--- a/share/html/Admin/CustomFields/index.html
+++ b/share/html/Admin/CustomFields/index.html
@@ -68,7 +68,7 @@
 
 % $m->callback(CallbackName => 'BeforeSubmit');
 
-<input type="submit" value="<% loc('Go!') %>" />
+<div align="right"><input type="submit" value="<% loc('Go!') %>" /></div>
 </form>
 
 <& /Elements/CollectionList,

commit 6147d3701e867a6f8321c3e2368b5f361951ce5d
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Jun 13 13:31:07 2014 +0200

    always show a page heading
    
    Also switch from h2 to h1 for parity with other Admin pages.

diff --git a/share/html/Admin/CustomFields/index.html b/share/html/Admin/CustomFields/index.html
index e67b762..cc1d4b6 100644
--- a/share/html/Admin/CustomFields/index.html
+++ b/share/html/Admin/CustomFields/index.html
@@ -49,9 +49,7 @@
 <& /Elements/Tabs &>
 
 % my $tmp = RT::CustomField->new( $session{'CurrentUser'} );
-% if ( $Type ) {
-<h2><% loc("Custom Fields for [_1]", $tmp->FriendlyLookupType( $Type )) %></h2>
-% }
+<h1><% loc("Custom Fields for [_1]", $Type ? $tmp->FriendlyLookupType( $Type ) : loc('any Object') ) %></h1>
 
 <form action="<%RT->Config->Get('WebPath')%>/Admin/CustomFields/index.html" method="get">
 <&|/l&>Only show custom fields for:</&>

commit 8abd524a3433f6e178729e5c1fb53b544ef71bf6
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Jun 13 15:31:00 2014 +0200

    display Disabled as the last column for queues
    
    as for Scrips

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 240adf6..1847f71 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2943,7 +2943,7 @@ Set(%AdminSearchResultFormat,
     Queues =>
         q{'<a href="__WebPath__/Admin/Queues/Modify.html?id=__id__">__id__</a>/TITLE:#'}
         .q{,'<a href="__WebPath__/Admin/Queues/Modify.html?id=__id__">__Name__</a>/TITLE:Name'}
-        .q{,__Description__,__Address__,__Priority__,__DefaultDueIn__,__Disabled__,__Lifecycle__,__SubjectTag__},
+        .q{,__Description__,__Address__,__Priority__,__DefaultDueIn__,__Lifecycle__,__SubjectTag__,__Disabled__},
 
     Groups =>
         q{'<a href="__WebPath__/Admin/Groups/Modify.html?id=__id__">__id__</a>/TITLE:#'}

commit 646b6401714c1e59ee42241f97d6149810482083
Author: Christian Loos <cloos at netcologne.de>
Date:   Mon Jun 16 13:50:54 2014 +0200

    add Disabled column map entries for Classes, Groups and Users

diff --git a/share/html/Elements/RT__Class/ColumnMap b/share/html/Elements/RT__Class/ColumnMap
index 9ef6a39..e125b7c 100644
--- a/share/html/Elements/RT__Class/ColumnMap
+++ b/share/html/Elements/RT__Class/ColumnMap
@@ -62,6 +62,11 @@ my $COLUMN_MAP = {
         attribute => 'Description',
         value     => sub { return $_[0]->Description() },
     },
+    Disabled => {
+        title     => 'Status', # loc
+        attribute => 'Disabled',
+        value     => sub { return $_[0]->Disabled? $_[0]->loc('Disabled'): $_[0]->loc('Enabled') },
+    },
 };
 
 
diff --git a/share/html/Elements/RT__Group/ColumnMap b/share/html/Elements/RT__Group/ColumnMap
index e2284e0..b8817a3 100644
--- a/share/html/Elements/RT__Group/ColumnMap
+++ b/share/html/Elements/RT__Group/ColumnMap
@@ -78,6 +78,10 @@ my $COLUMN_MAP = {
         attribute => 'Description',
         value     => sub { return $_[0]->Description() },
     },
+    Disabled => {
+        title     => 'Status', # loc
+        value     => sub { return $_[0]->Disabled? $_[0]->loc('Disabled'): $_[0]->loc('Enabled') },
+    },
 };
 
 </%ONCE>
diff --git a/share/html/Elements/RT__User/ColumnMap b/share/html/Elements/RT__User/ColumnMap
index 5c16e48..52801d9 100644
--- a/share/html/Elements/RT__User/ColumnMap
+++ b/share/html/Elements/RT__User/ColumnMap
@@ -142,6 +142,10 @@ my $COLUMN_MAP = {
         attribute   => 'FreeformContactInfo',
         value       => sub { return $_[0]->FreeformContactInfo() },
     },
+    Disabled => {
+        title     => 'Status', # loc
+        value     => sub { return $_[0]->Disabled? $_[0]->loc('Disabled'): $_[0]->loc('Enabled') },
+    },
 };
 
 </%ONCE>

commit b655f39b5b327fb3bbe1c9605372ce7c050b52fd
Author: Christian Loos <cloos at netcologne.de>
Date:   Mon Jun 16 13:53:13 2014 +0200

    add Disabled to AdminSearchResultFormat for Classes, CustomFields, Groups and Users

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 1847f71..9740837 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2948,17 +2948,17 @@ Set(%AdminSearchResultFormat,
     Groups =>
         q{'<a href="__WebPath__/Admin/Groups/Modify.html?id=__id__">__id__</a>/TITLE:#'}
         .q{,'<a href="__WebPath__/Admin/Groups/Modify.html?id=__id__">__Name__</a>/TITLE:Name'}
-        .q{,'__Description__'},
+        .q{,'__Description__',__Disabled__},
 
     Users =>
         q{'<a href="__WebPath__/Admin/Users/Modify.html?id=__id__">__id__</a>/TITLE:#'}
         .q{,'<a href="__WebPath__/Admin/Users/Modify.html?id=__id__">__Name__</a>/TITLE:Name'}
-        .q{,__RealName__, __EmailAddress__},
+        .q{,__RealName__, __EmailAddress__,__Disabled__},
 
     CustomFields =>
         q{'<a href="__WebPath__/Admin/CustomFields/Modify.html?id=__id__">__id__</a>/TITLE:#'}
         .q{,'<a href="__WebPath__/Admin/CustomFields/Modify.html?id=__id__">__Name__</a>/TITLE:Name'}
-        .q{,__AddedTo__, __FriendlyType__, __FriendlyPattern__},
+        .q{,__AddedTo__, __FriendlyType__, __FriendlyPattern__,__Disabled__},
 
     Scrips =>
         q{'<a href="__WebPath__/Admin/Scrips/Modify.html?id=__id____From__">__id__</a>/TITLE:#'}
@@ -2972,7 +2972,7 @@ Set(%AdminSearchResultFormat,
     Classes =>
         q{ '<a href="__WebPath__/Admin/Articles/Classes/Modify.html?id=__id__">__id__</a>/TITLE:#'}
         .q{,'<a href="__WebPath__/Admin/Articles/Classes/Modify.html?id=__id__">__Name__</a>/TITLE:Name'}
-        .q{,__Description__},
+        .q{,__Description__,__Disabled__},
 );
 
 =back

commit 6524587521c33b8cf718f48e411fb8b1c7bc0337
Author: Christian Loos <cloos at netcologne.de>
Date:   Mon Jun 16 13:54:05 2014 +0200

    more descriptive title "Status" for Disabled column map entry
    
    For Classes, Groups and Users the Disabled column map entries was added with
    fcec5ba already with the Status title.

diff --git a/share/html/Elements/RT__CustomField/ColumnMap b/share/html/Elements/RT__CustomField/ColumnMap
index d301214..c24626b 100644
--- a/share/html/Elements/RT__CustomField/ColumnMap
+++ b/share/html/Elements/RT__CustomField/ColumnMap
@@ -53,7 +53,7 @@ $GenericMap => {}
 <%ONCE>
 my $COLUMN_MAP = {
     Disabled => {
-        title     => \' ',
+        title     => 'Status', # loc
         attribute => 'Disabled',
         value     => sub { return $_[0]->Disabled? $_[0]->loc('Disabled'): $_[0]->loc('Enabled') },
     },
diff --git a/share/html/Elements/RT__Queue/ColumnMap b/share/html/Elements/RT__Queue/ColumnMap
index 117aff9..3bb47ab 100644
--- a/share/html/Elements/RT__Queue/ColumnMap
+++ b/share/html/Elements/RT__Queue/ColumnMap
@@ -53,7 +53,7 @@ $GenericMap => {}
 <%ONCE>
 my $COLUMN_MAP = {
     Disabled => {
-        title     => \' ',
+        title     => 'Status', # loc
         attribute => 'Disabled',
         value     => sub { return $_[0]->Disabled? $_[0]->loc('Disabled'): $_[0]->loc('Enabled') },
     },
diff --git a/share/html/Elements/RT__Scrip/ColumnMap b/share/html/Elements/RT__Scrip/ColumnMap
index b9be51e..8aa2d4f 100644
--- a/share/html/Elements/RT__Scrip/ColumnMap
+++ b/share/html/Elements/RT__Scrip/ColumnMap
@@ -107,7 +107,7 @@ my $COLUMN_MAP = {
         value     => sub { return $_[0]->Description() },
     },
     Disabled => {
-        title     => \' ',
+        title     => 'Status', # loc
         attribute => 'Disabled',
         value     => sub { return $_[0]->Disabled? $_[0]->loc('Disabled'): $_[0]->loc('Enabled') },
     },

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


More information about the rt-commit mailing list