Fixes #3775 updates the log browser link and keeps the refine area open if the page...

diff --git a/mod/logbrowser/start.php b/mod/logbrowser/start.php
index 3bffe800a9bf61796aa7ef5f5ffdc7b360949736..22659877bbda265791b52c0bcba5496df1fd8fe6 100644 (file)
--- a/mod/logbrowser/start.php
+++ b/mod/logbrowser/start.php
@@ -23,7 +23,7 @@ function logbrowser_init() {
 function logbrowser_user_hover_menu($hook, $type, $return, $params) {
        $user = $params['entity'];
 
-       $url = "admin/utilities/logbrowser?user_guid={$user->guid}";
+       $url = "admin/administer_utilities/logbrowser?user_guid={$user->guid}";
        $item = new ElggMenuItem('logbrowser', elgg_echo('logbrowser:explore'), $url);
        $item->setSection('admin');
        $return[] = $item;

diff --git a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
index 2be1f33dc0a368d141ac810a0454169272ea6714..a04ef686a4ab77690cf403a0a164c87d9a354f46 100644 (file)
--- a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
+++ b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
@@ -13,14 +13,14 @@ $offset = get_input('offset');
 $search_username = get_input('search_username');
 if ($search_username) {
        if ($user = get_user_by_username($search_username)) {
-               $user = $user->guid;
+               $user_guid = $user->guid;
        }
 } else {
        $user_guid = get_input('user_guid',0);
        if ($user_guid) {
-               $user = (int) $user_guid;
+               $user_guid = (int) $user_guid;
        } else {
-               $user = "";
+               $user_guid = null;
        }
 }
 
@@ -35,14 +35,14 @@ if ($timeupper) {
 }
 
 $refine = elgg_view('logbrowser/refine', array(
-       'user_guid' => $user,
+       'user_guid' => $user_guid,
        'timeupper' => $timeupper,
        'timelower' => $timelower,
 ));
 
 // Get log entries
-$log = get_system_log($user, "", "", "","", $limit, $offset, false, $timeupper, $timelower);
-$count = get_system_log($user, "", "", "","", $limit, $offset, true, $timeupper, $timelower);
+$log = get_system_log($user_guid, "", "", "","", $limit, $offset, false, $timeupper, $timelower);
+$count = get_system_log($user_guid, "", "", "","", $limit, $offset, true, $timeupper, $timelower);
 
 $table = elgg_view('logbrowser/table', array('log_entries' => $log));
 

diff --git a/mod/logbrowser/views/default/logbrowser/refine.php b/mod/logbrowser/views/default/logbrowser/refine.php
index 27cb6042fb6c5bea7cf0a5d319f9e917027e70f2..86460c79e050ab08fa48825b0982c4da4d13e5bc 100644 (file)
--- a/mod/logbrowser/views/default/logbrowser/refine.php
+++ b/mod/logbrowser/views/default/logbrowser/refine.php
@@ -18,13 +18,18 @@ $toggle_link = elgg_view('output/url', array(
        'rel' => 'toggle',
 ));
 
+$form_class = 'elgg-module elgg-module-inline';
+if (!isset($vars['user_guid'])) {
+       $form_class .= ' hidden';
+}
+
 ?>
 
 <div id="logbrowser-search-area" class="mbm">
        <div>
                <?php echo $toggle_link; ?>
        </div>
-       <div id="log-browser-search-form" class="elgg-module elgg-module-inline hidden">
+       <div id="log-browser-search-form" class="<?php echo $form_class; ?>">
                <div class="elgg-head">
                        <h3><?php echo elgg_echo('logbrowser:search'); ?></h3>
                </div>