[Rt-commit] rtfm branch, master, updated. a0b64dbbb33e13b0902eebe6ba239afd516af6a5

[Kevin Falcone]

The branch, master has been updated
       via  a0b64dbbb33e13b0902eebe6ba239afd516af6a5 (commit)
       via  5d98f8bd11472f70adadee66bc81603f19d16f42 (commit)
       via  9e718c882468a5a72682201d74ee71e34997773b (commit)
       via  83f6b548fee1f5de1b256a6cf194a3d1baf2802f (commit)
       via  6cfb5721bfcbef931c4e87a8e708a9605c59bbba (commit)
       via  ca97544b376e889b8873b399b18c6c606199a144 (commit)
      from  653bd1dcd0bb3cdb0e8451fa74be96fe3c20c09d (commit)

Summary of changes:
 .../Default => Elements/ShowSearch/ModifySearch}   |   44 ++--
 .../ColumnMap                                      |   98 ++++--
 html/RTFM/Article/Elements/ShowSearchResults       |  129 --------
 html/RTFM/Article/Search.html                      |  291 ++----------------
 .../Elements/Tabs/Default => Search/Article.html}  |   42 ++--
 html/Search/Elements/Article                       |   19 +-
 lib/RT/FM/ArticleCollection.pm                     |  340 ++++++++++++++++++++
 7 files changed, 485 insertions(+), 478 deletions(-)
 copy html/Callbacks/RTFM/{Ticket/Elements/Tabs/Default => Elements/ShowSearch/ModifySearch} (79%)
 copy html/Elements/{RT__FM__ClassCollection => RT__FM__ArticleCollection}/ColumnMap (53%)
 delete mode 100644 html/RTFM/Article/Elements/ShowSearchResults
 copy html/{Callbacks/RTFM/Admin/Elements/Tabs/Default => Search/Article.html} (83%)

- Log -----------------------------------------------------------------
commit a0b64dbbb33e13b0902eebe6ba239afd516af6a5
Merge: 653bd1d 5d98f8b
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Nov 1 18:40:15 2010 -0400

    Merge branch 'search-results-view-refactor'
    
    Conflicts:
    	html/RTFM/Article/Elements/ShowSearchResults
    	html/Search/Elements/Article

diff --cc html/Search/Elements/Article
index 4ef40fe,732bcae..185f440
--- a/html/Search/Elements/Article
+++ b/html/Search/Elements/Article
@@@ -43,9 -43,22 +43,22 @@@
  %# 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 }}}
- <&|/l&>RTFM Article searches cannot be displayed inline, you can view the results</&>
- <a href="<%$RT::WebPath%>/RTFM/Article/Search.html<%$QueryString%>"><&|/l&>here</&></a>
 -%# 
++%#
+ %# END BPS TAGGED BLOCK }}}
+ <& /Elements/CollectionList, %ARGS, 
+     Collection => $articles, 
+     Class => 'RT::FM::ArticleCollection',
+     Format => q{
+     '<a href="/RTFM/Article/Display.html?id=__id__">__id__</a>/TITLE:#',
+     '<a href="/RTFM/Article/Display.html?id=__id__">__Name__</a>/TITLE:Name',
+     '__ClassName__',
+     '__CreatedRelative__',
+     '__LastUpdatedRelative__',
+     '__Summary__',
+     '__Topics__', }
+     &>
  <%INIT>
  my $QueryString = "?".$m->comp('/Elements/QueryString', %{$ARGS{args}});
+ my $articles = RT::FM::ArticleCollection->new( $session{CurrentUser} );
+ $articles->Search( %{$ARGS{args}} );
  </%INIT>

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