Merge branch '4.4-trunk' into 5.0-trunk

This merge contains a few extra tests updates so they can pass after the
merge. Upgrade steps in 4.4.6 have been ported to 5.0.3 accordingly too.

9 files changed, 53 insertions, 7 deletions

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index c495fb4ab1..0b56bd12f3 100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -516,8 +516,8 @@ accordingly.
 
 Set($ExtractSubjectTagMatch, qr/\[[^\]]+? #\d+\]/);
 Set($ExtractSubjectTagNoMatch, ( ${RT::EmailSubjectTagRegex}
-       ? qr/\[(?:${RT::EmailSubjectTagRegex}) #\d+\]/
-       : qr/\[\Q$RT::rtname\E #\d+\]/));
+       ? qr{\[(?:https?://)?(?:${RT::EmailSubjectTagRegex}) #\d+\]}
+       : qr{\[(?:https?://)?\Q$RT::rtname\E #\d+\]}));
 
 =item C<$CheckMoreMSMailHeaders>
 
@@ -1740,7 +1740,7 @@ Set(@CustomFieldValuesCanonicalizers, qw(
 
 =item C<%CustomFieldGroupings>
 
-This option affects the display of ticket, user, and asset custom fields
+This option affects the display of ticket, user, group, and asset custom fields
 in the web interface. It does not address the sorting of custom fields within
 the groupings; that ordering is controlled by the Ticket Custom Fields tab in
 Queue configuration in the Admin UI. Asset custom field ordering is
@@ -1771,9 +1771,25 @@ Set C<%CustomFieldGroupings> to a nested structure similar to the following:
 
 The first level keys are record types for which CFs may be used, and the
 values are either hashrefs or arrayrefs -- if arrayrefs, then the
-ordering is preserved during display, otherwise groupings are displayed
-alphabetically.  The second level keys are the grouping names and the
-values are array refs containing a list of CF names.
+order of grouping entries is preserved during display, otherwise groupings
+are displayed alphabetically. The second level keys are the grouping names
+and the values are array refs containing a list of CF names.
+
+For C<RT::Ticket> and C<RT::Asset>, you can specify global, and queue
+or catalog level gropuings. For example, if you wanted to diplay some
+groupings only on tickets in the General queue, you can create an entry
+for 'General'. Global configurations then go in 'Default' as shown below.
+
+    'RT::Ticket' => {
+        'Default' => [
+            'Grouping Name'    => [ 'CF Name' ],
+        ],
+        'General' => [
+            'Grouping Name'    => [ 'CF Name', 'Another CF' ],
+            'Another Grouping' => ['Some CF'],
+            'Dates'            => ['Shipped date'],
+        ],
+    },
 
 There are several special built-in groupings which RT displays in
 specific places (usually the collapsible box of the same title).  The
diff --git a/etc/schema.Oracle b/etc/schema.Oracle
index 57fbae685d..324f790d19 100644
--- a/etc/schema.Oracle
+++ b/etc/schema.Oracle
@@ -320,6 +320,8 @@ CREATE TABLE ObjectCustomFields (
         LastUpdated     DATE
 );
 
+CREATE INDEX ObjectCustomFields1 ON ObjectCustomFields (ObjectId);
+
 
 CREATE SEQUENCE OBJECTCUSTOMFIELDVALUES_seq;
 CREATE TABLE ObjectCustomFieldValues (
diff --git a/etc/schema.Pg b/etc/schema.Pg
index 5f6c3d85fb..9f34ec4b0a 100644
--- a/etc/schema.Pg
+++ b/etc/schema.Pg
@@ -383,7 +383,7 @@ CREATE TABLE Users (
 
 
 CREATE UNIQUE INDEX Users1 ON Users (LOWER(Name)) ;
-CREATE INDEX Users4 ON Users (EmailAddress);
+CREATE INDEX Users4 ON Users (LOWER(EmailAddress));
 
 
 
@@ -574,6 +574,8 @@ CREATE TABLE ObjectCustomFields (
 
 );
 
+CREATE INDEX ObjectCustomFields1 ON ObjectCustomFields (ObjectId);
+
 
 
 
diff --git a/etc/schema.SQLite b/etc/schema.SQLite
index bc8b456ecd..d2e455f9e5 100644
--- a/etc/schema.SQLite
+++ b/etc/schema.SQLite
@@ -414,6 +414,8 @@ CREATE TABLE ObjectCustomFields (
   PRIMARY KEY (id)
 ) ;
 
+CREATE INDEX ObjectCustomFields1 ON ObjectCustomFields (ObjectId);
+
 
 
 CREATE TABLE CustomFieldValues (
diff --git a/etc/schema.mysql b/etc/schema.mysql
index 6c368b7909..f773ffd472 100644
--- a/etc/schema.mysql
+++ b/etc/schema.mysql
@@ -386,6 +386,8 @@ CREATE TABLE ObjectCustomFields (
   PRIMARY KEY (id)
 ) ENGINE=InnoDB CHARACTER SET utf8mb4;
 
+CREATE INDEX ObjectCustomFields1 ON ObjectCustomFields (ObjectId);
+
 
 
 CREATE TABLE CustomFieldValues (
diff --git a/etc/upgrade/4.4.6/indexes b/etc/upgrade/4.4.6/indexes
new file mode 100644
index 0000000000..1147a739a3
--- /dev/null
+++ b/etc/upgrade/4.4.6/indexes
@@ -0,0 +1,9 @@
+use strict;
+use warnings;
+
+$RT::Handle->MakeSureIndexExists(
+    Table => 'ObjectCustomFields',
+    Columns => ['ObjectId'],
+);
+
+1;
diff --git a/etc/upgrade/4.4.6/schema.Pg b/etc/upgrade/4.4.6/schema.Pg
new file mode 100644
index 0000000000..628b446a75
--- /dev/null
+++ b/etc/upgrade/4.4.6/schema.Pg
@@ -0,0 +1,2 @@
+DROP INDEX Users4;
+CREATE INDEX Users4 ON Users (LOWER(EmailAddress));
diff --git a/etc/upgrade/5.0.3/indexes b/etc/upgrade/5.0.3/indexes
new file mode 100644
index 0000000000..1147a739a3
--- /dev/null
+++ b/etc/upgrade/5.0.3/indexes
@@ -0,0 +1,9 @@
+use strict;
+use warnings;
+
+$RT::Handle->MakeSureIndexExists(
+    Table => 'ObjectCustomFields',
+    Columns => ['ObjectId'],
+);
+
+1;
diff --git a/etc/upgrade/5.0.3/schema.Pg b/etc/upgrade/5.0.3/schema.Pg
new file mode 100644
index 0000000000..628b446a75
--- /dev/null
+++ b/etc/upgrade/5.0.3/schema.Pg
@@ -0,0 +1,2 @@
+DROP INDEX Users4;
+CREATE INDEX Users4 ON Users (LOWER(EmailAddress));