Merge branch '6.0/calendar-date-fields' into 6.0-trunk

Author: cbrandtbuffalo

share/html/Search/Elements/Calendar

@@ -356,8 +356,6 @@ my $BaseQuery = $DECODED_ARGS->{BaseQuery};
 
 $BaseQuery ||= $Query;
 
-my @DateTypes = qw/Created Starts Started Due LastUpdated Resolved/;
-
 my $rtdate = RT::Date->new($session{'CurrentUser'});
 
 my $weekstart = 'Sunday'; #RT::SiteConfig?  user pref?
@@ -408,40 +406,32 @@ my $QueryString =
       );
 
 # we search all date types in Format string
-my @CoreDates    = grep { $TempFormat =~ m/__${_}(Relative)?__/ } @DateTypes;
-my @CustomFields = (
-    $TempFormat =~ /__(CustomField\.\{.*?\})__/g,
-    $TempFormat =~ /__(CustomFieldView\.\{.*?\})__/g
-);
-my @DateCustomFields;
-
-for my $CustomField (@CustomFields) {
-    my $LintCustomField = $CustomField;
-    my $QueryCustomField = $CustomField;
-
-    # Handle both CustomField.{name} and CustomFieldView.{name} formats
-    if ( $LintCustomField =~ /CustomField\.\{(.*)\}/ ) {
-        $LintCustomField = $1;
-        # QueryCustomField stays the same for CustomField format
-    } elsif ( $LintCustomField =~ /CustomFieldView\.\{(.*)\}/ ) {
-        $LintCustomField = $1;
-        # Convert CustomFieldView to CustomField for TicketSQL compatibility
-        $QueryCustomField = "CustomField.{$1}";
+my @formats = $m->comp('/Elements/CollectionAsTable/ParseFormat', Format => $TempFormat);
+my @Dates;
+for my $format (@formats) {
+    if ( my $attr = $format->{attribute} ) {
+        my $table_column = $m->comp(
+            '/Elements/ColumnMap',
+            Class => 'RT__Ticket',
+            Name  => $attr,
+            Attr  => 'attribute',
+        );
+
+        if ( $attr =~ /^(?:CF|CustomField(?:View)?)\./ ) {
+            my $cf = RT::CustomField->new( RT->SystemUser );
+            my $name = $table_column->();
+            $cf->LoadByName( Name => $name, LookupType => 'RT::Queue-RT::Ticket' );
+            push @Dates, "CF.{$name}" if $cf->id && ( $cf->Type eq 'Date' || $cf->Type eq 'DateTime' );
+        }
+        elsif (RT::Ticket->_ClassAccessible->{$table_column}
+            && RT::Ticket->_ClassAccessible->{$table_column}{type} eq 'datetime' )
+        {
+            push @Dates, $table_column;
+        }
     }
-
-    my $CustomFieldObj = RT::CustomField->new( RT->SystemUser );
-    $CustomFieldObj->LoadByName( Name => $LintCustomField );
-    push @DateCustomFields, $QueryCustomField
-        if $CustomFieldObj->id
-        && ( $CustomFieldObj->Type eq 'Date'
-        || $CustomFieldObj->Type eq 'DateTime' );
 }
 
-my @Dates = (@CoreDates, @DateCustomFields);
-@Dates = map { $_ =~ s/^CustomField\.(.*)$/CF.$1/; $_ } @Dates;
-
-# used to display or not a date in Element/CalendarEvent
-my %DateTypes = map { $_ => 1 } @Dates;
+@Dates = List::MoreUtils::uniq(@Dates);
 
 # Auto-detect multiple day events based on Format fields
 my ($starts_field, $ends_field) = RT::Search::Calendar::GetMultipleDayFields(\@Dates);

t/web/search_results.t

@@ -15,6 +15,16 @@ RT::Test->create_tickets(
     { Requestor => 'bob@localhost', },
 );
 
+for my $cf_type (qw/Freeform Date DateTime/) {
+    my $cf = RT::Test->load_or_create_custom_field(
+        Name       => "${cf_type}Example",
+        Type       => $cf_type,
+        Queue      => 0,
+        LookupType => 'RT::Queue-RT::Ticket',
+    );
+    ok $cf && $cf->id, "Created $cf_type custom field";
+}
+
 ok $m->login, 'logged in';
 
 $m->get_ok('/Search/Results.html?Query=id>0');
@@ -67,4 +77,33 @@ diag "Test extended status column map when 'UseSQLForACLChecks' is false";
     $m_user_a->content_lacks('Invalid column', 'No invalid column map results from extended status');
 }
 
+diag 'Test date columns for calendar display mode';
+{
+    ok $m->login, 'logged in';
+    $m->get_ok("/Search/Calendar.html?Query=id>0&Format='__id__', CF.FreeformExample");
+    $m->content_contains( 'No date columns were found' );
+
+    for my $field (qw/Created Starts Started Due LastUpdated Resolved/) {
+        for my $column ( $field, "${field}Relative", "__${field}__", "__${field}Relative__" ) {
+            $m->get_ok("/Search/Calendar.html?Query=id>0&Format='__id__', $column");
+            $m->content_lacks( 'No date columns were found', "Date column $column works" );
+        }
+    }
+
+    for my $field (qw/DateExample DateTimeExample/) {
+        for my $column (
+            "CF.$field",                    "CF.{$field}",
+            "CustomField.$field",           "CustomField.{$field}",
+            "__CF.${field}__",              "__CF.{$field}__",
+            "__CustomField.${field}__",     "__CustomField.{$field}__",
+            "CustomFieldView.$field",       "CustomFieldView.{$field}",
+            "__CustomFieldView.${field}__", "__CustomFieldView.{$field}__",
+            )
+        {
+            $m->get_ok("/Search/Calendar.html?Query=id>0&Format='__id__', $column");
+            $m->content_lacks( 'No date columns were found', "Date column $column works" );
+        }
+    }
+}
+
 done_testing;