Merge branch 'search-results-view-refactor'

Conflicts:
	html/RTFM/Article/Elements/ShowSearchResults
	html/Search/Elements/Article

html/Callbacks/RTFM/Elements/ShowSearch/ModifySearch

@@ -0,0 +1,61 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%# 
+%# COPYRIGHT:
+%#  
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
+%#                                          <sales@bestpractical.com>
+%# 
+%# (Except where explicitly superseded by other copyright notices)
+%# 
+%# 
+%# LICENSE:
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/copyleft/gpl.html.
+%# 
+%# 
+%# CONTRIBUTION SUBMISSION POLICY:
+%# 
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%# 
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%# 
+%# END BPS TAGGED BLOCK }}}
+<%init>
+if ( $OriginalSearch->{SearchType} eq 'Article' && $OriginalSearch->{args} 
+    && ref $OriginalSearch->{args} eq 'HASH' ) {
+    %$OriginalSearch = ( %$OriginalSearch, %{$OriginalSearch->{args}} );
+    delete $OriginalSearch->{args};
+
+    $OriginalSearch->{LoadSavedSearch} ||= $ARGS{SavedSearch};
+}
+
+</%init>
+
+<%args>
+$OriginalSearch => undef
+</%args>

html/Elements/RT__FM__ArticleCollection/ColumnMap

@@ -0,0 +1,107 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%# 
+%# COPYRIGHT:
+%# 
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
+%#                                          <jesse@bestpractical.com>
+%# 
+%# (Except where explicitly superseded by other copyright notices)
+%# 
+%# 
+%# LICENSE:
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%# 
+%# 
+%# CONTRIBUTION SUBMISSION POLICY:
+%# 
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%# 
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%# 
+%# END BPS TAGGED BLOCK }}}
+<%ARGS>
+$Name => undef
+$Attr => undef
+</%ARGS>
+
+
+<%ONCE>
+my $COLUMN_MAP;
+
+$COLUMN_MAP = {
+    Name => {
+        attribute => 'Name',
+        title     => 'Name',                   # loc
+        value     => sub { $_[0]->Name },
+    },
+    Summary => {
+        attribute => 'Summary',
+        title     => 'Summary',                   # loc
+        value     => sub { $_[0]->Summary },
+    },
+    Class => {
+        attribute => 'Class',
+        title     => 'Class id',                   # loc
+        value     => sub { $_[0]->Class },
+    },
+    ClassName => {
+        attribute => 'Class',
+        title     => 'Class',                               # loc
+        value     => sub { $_[0]->ClassObj->Name },
+    },
+    CreatedRelative => {
+        attribute => 'Created',
+        title => 'Created', # loc
+        value => sub { $_[0]->CreatedObj->AgeAsString },
+    },
+    LastUpdatedRelative => {
+        attribute => 'LastUpdated',
+        title => 'LastUpdated', # loc
+        value => sub { $_[0]->LastUpdatedObj->AgeAsString },
+    },
+    Topics => {
+        title => 'Topics',                                  # loc
+        value => sub {
+            my $topics = '';
+            my $Topics = $_[0]->Topics;
+            while ( my $t = $Topics->Next ) {
+                $topics .=
+                  $m->scomp( '/RTFM/Elements/ShowTopic', topic => $t->TopicObj )
+                  . '<br />';
+            }
+            return \$topics;
+        },
+    }
+};
+
+</%ONCE>
+<%init>
+$m->callback( COLUMN_MAP => $COLUMN_MAP, CallbackName => 'Once', CallbackOnce => 1 );
+return GetColumnMapEntry( Map => $COLUMN_MAP, Name => $Name, Attribute => $Attr );
+</%init>