[Bps-public-commit] rt-extension-assetsql branch, master, updated. 85535f3fdb0fc3d4352dea9fb5d1cb12d008cff7

[Shawn Moore]

The branch, master has been updated
       via  85535f3fdb0fc3d4352dea9fb5d1cb12d008cff7 (commit)
      from  0e02a10a6cd9f4a05f00aef5597386c7bf4406a7 (commit)

Summary of changes:
 html/Callbacks/AssetSQL/Asset/Search/index.html/Initial |  5 +++++
 patches/rt-4.4.0-4.4.1.patch                            | 12 ++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 html/Callbacks/AssetSQL/Asset/Search/index.html/Initial

- Log -----------------------------------------------------------------
commit 85535f3fdb0fc3d4352dea9fb5d1cb12d008cff7
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed Jun 15 18:55:08 2016 +0000

    Redirect from /Asset/Search to query builder if needed

diff --git a/html/Callbacks/AssetSQL/Asset/Search/index.html/Initial b/html/Callbacks/AssetSQL/Asset/Search/index.html/Initial
new file mode 100644
index 0000000..f66b854
--- /dev/null
+++ b/html/Callbacks/AssetSQL/Asset/Search/index.html/Initial
@@ -0,0 +1,5 @@
+<%INIT>
+if (RT->Config->Get('AssetSQL_HideSimpleSearch')) {
+    $m->redirect( RT->Config->Get("WebPath") .'/Asset/Search/Build.html' );
+}
+</%INIT>
diff --git a/patches/rt-4.4.0-4.4.1.patch b/patches/rt-4.4.0-4.4.1.patch
index 4d0a92b..ad9c98f 100644
--- a/patches/rt-4.4.0-4.4.1.patch
+++ b/patches/rt-4.4.0-4.4.1.patch
@@ -121,3 +121,15 @@ index f4ac8a9..e672e3b 100644
  };
  
  
+diff --git a/share/html/Asset/Search/index.html b/share/html/Asset/Search/index.html
+index f1ebfa5..903ceb4 100644
+--- a/share/html/Asset/Search/index.html
++++ b/share/html/Asset/Search/index.html
+@@ -58,6 +58,7 @@ my $title = ( $ARGS{'SearchAssets'} or $ARGS{q} ) ?
+       loc("Found [quant,_1,asset,assets]",$assets->Count)
+     : loc("Assets");
+ 
++$m->callback( CallbackName => 'Initial', Assets => $assets, ARGSRef => \%ARGS);
+ </%init>
+ <& /Elements/Header, Title => $title &>
+ <& /Elements/Tabs &>

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