Fixed bug#6601, thanks to S7.

des-otrs · Jun 30, 2014 · 732a8fc · 732a8fc
1 parent 559e965
commit 732a8fc
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 79 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,5 @@
 #3.3.9 2014-??-??
+ - 2014-06-30 Fixed bug#[6601](http://bugs.otrs.org/show_bug.cgi?id=6601) - Changing search options changes order of fields, thanks to S7.
  - 2014-06-23 Fixed bug#[10246](http://bugs.otrs.org/show_bug.cgi?id=10246) - ProcessManagement: ConditionLinking OR in a Transition doesn't work.
  - 2014-06-23 Fixed bug#[10559](http://bugs.otrs.org/show_bug.cgi?id=10559) - "Previous Owner" don't use the FirstnameLastnameOrder configuration.
  - 2014-06-23 Fixed bug#[10532](http://bugs.otrs.org/show_bug.cgi?id=10532) - PostMasterMailbox.pl hangs parsing mails.

diff --git a/Kernel/Modules/AgentTicketSearch.pm b/Kernel/Modules/AgentTicketSearch.pm
@@ -1132,62 +1132,114 @@ sub Run {
         }
         my @Attributes = (
             {
-                Key   => 'TicketNumber',
-                Value => 'Ticket Number',
+                Key   => 'StateIDs',
+                Value => 'State',
+            },
+            {
+                Key   => 'QueueIDs',
+                Value => 'Queue',
+            },
+            {
+                Key   => 'ArticleCreateTimePoint',
+                Value => 'Article Create Time (before/after)',
+            },
+            {
+                Key   => 'ArticleCreateTimeSlot',
+                Value => 'Article Create Time (between)',
+            },
+            {
+                Key   => 'Body',
+                Value => 'Body',
+            },
+            {
+                Key   => 'Cc',
+                Value => 'Cc',
+            },
+            {
+                Key   => 'CustomerID',
+                Value => 'CustomerID',
+            },
+            {
+                Key   => 'CustomerUserLogin',
+                Value => 'Customer User Login',
+            },
+            {
+                Key   => 'From',
+                Value => 'From',
             },
             {
                 Key   => 'Fulltext',
                 Value => 'Fulltext',
             },
+        );
+
+        if ( $Self->{ConfigObject}->Get('Ticket::ArchiveSystem') ) {
+            push @Attributes, (
+                {
+                    Key   => 'SearchInArchive',
+                    Value => 'Archive Search',
+                },
+            );
+        }
+
+        push @Attributes, (
             {
-                Key   => 'Title',
-                Value => 'Title',
+                Key   => 'Subject',
+                Value => 'Subject',
             },
             {
                 Key      => '',
                 Value    => '-',
                 Disabled => 1,
             },
             {
-                Key   => 'From',
-                Value => 'From',
+                Key   => 'TicketChangeTimePoint',
+                Value => 'Ticket Change Time (before/after)',
             },
             {
-                Key   => 'To',
-                Value => 'To',
+                Key   => 'TicketChangeTimeSlot',
+                Value => 'Ticket Change Time (between)',
             },
             {
-                Key   => 'Cc',
-                Value => 'Cc',
+                Key   => 'TicketCloseTimePoint',
+                Value => 'Ticket Close Time (before/after)',
             },
             {
-                Key   => 'Subject',
-                Value => 'Subject',
+                Key   => 'TicketCloseTimeSlot',
+                Value => 'Ticket Close Time (between)',
             },
             {
-                Key   => 'Body',
-                Value => 'Body',
+                Key   => 'TicketCreateTimePoint',
+                Value => 'Ticket Create Time (before/after)',
             },
             {
-                Key      => '',
-                Value    => '-',
-                Disabled => 1,
+                Key   => 'TicketCreateTimeSlot',
+                Value => 'Ticket Create Time (between)',
             },
             {
-                Key   => 'CustomerID',
-                Value => 'CustomerID',
+                Key   => 'TicketEscalationTimePoint',
+                Value => 'Ticket Escalation Time (before/after)',
             },
             {
-                Key   => 'CustomerUserLogin',
-                Value => 'Customer User Login',
+                Key   => 'TicketEscalationTimeSlot',
+                Value => 'Ticket Escalation Time (between)',
             },
             {
-                Key   => 'StateIDs',
-                Value => 'State',
+                Key   => 'TicketNumber',
+                Value => 'Ticket Number',
             },
             {
-                Key   => 'QueueIDs',
-                Value => 'Queue',
+                Key   => 'Title',
+                Value => 'Title',
+            },
+            {
+                Key   => 'To',
+                Value => 'To',
+            },
+            {
+                Key      => '',
+                Value    => '-',
+                Disabled => 1,
             },
             {
                 Key   => 'PriorityIDs',
@@ -1206,6 +1258,7 @@ sub Run {
                 Value => 'Created by',
             },
         );
+
         if ( $Self->{ConfigObject}->Get('Ticket::Watcher') ) {
             push @Attributes, (
                 {
@@ -1230,6 +1283,14 @@ sub Run {
                 },
             );
         }
+
+        push @Attributes, (
+            {
+                Key   => 'LockIDs',
+                Value => 'Lock',
+            },
+        );
+
         if ( $Self->{ConfigObject}->Get('Ticket::Service') ) {
             push @Attributes, (
                 {
@@ -1399,60 +1460,6 @@ sub Run {
             }
         }
 
-        push @Attributes, (
-            {
-                Key   => 'LockIDs',
-                Value => 'Lock',
-            },
-            {
-                Key   => 'TicketCreateTimePoint',
-                Value => 'Ticket Create Time (before/after)',
-            },
-            {
-                Key   => 'TicketCreateTimeSlot',
-                Value => 'Ticket Create Time (between)',
-            },
-            {
-                Key   => 'TicketChangeTimePoint',
-                Value => 'Ticket Change Time (before/after)',
-            },
-            {
-                Key   => 'TicketChangeTimeSlot',
-                Value => 'Ticket Change Time (between)',
-            },
-            {
-                Key   => 'TicketCloseTimePoint',
-                Value => 'Ticket Close Time (before/after)',
-            },
-            {
-                Key   => 'TicketCloseTimeSlot',
-                Value => 'Ticket Close Time (between)',
-            },
-            {
-                Key   => 'TicketEscalationTimePoint',
-                Value => 'Ticket Escalation Time (before/after)',
-            },
-            {
-                Key   => 'TicketEscalationTimeSlot',
-                Value => 'Ticket Escalation Time (between)',
-            },
-            {
-                Key   => 'ArticleCreateTimePoint',
-                Value => 'Article Create Time (before/after)',
-            },
-            {
-                Key   => 'ArticleCreateTimeSlot',
-                Value => 'Article Create Time (between)',
-            },
-        );
-        if ( $Self->{ConfigObject}->Get('Ticket::ArchiveSystem') ) {
-            push @Attributes, (
-                {
-                    Key   => 'SearchInArchive',
-                    Value => 'Archive Search',
-                },
-            );
-        }
         $Param{AttributesStrg} = $Self->{LayoutObject}->BuildSelection(
             Data     => \@Attributes,
             Name     => 'Attribute',