Skip to content

Commit 02c2877

Browse files
committed
fix(wizard): bookmark was renamed into saved search i GLPI 9.2
fix #799
1 parent 7e31f3e commit 02c2877

File tree

1 file changed

+26
-16
lines changed

1 file changed

+26
-16
lines changed

inc/wizard.class.php

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -99,28 +99,38 @@ public static function header($title) {
9999
echo '</a></li>';
100100
}
101101

102-
$query = "SELECT `glpi_bookmarks`.*,
103-
`glpi_bookmarks_users`.`id` AS IS_DEFAULT
104-
FROM `glpi_bookmarks`
105-
LEFT JOIN `glpi_bookmarks_users`
106-
ON (`glpi_bookmarks`.`itemtype` = `glpi_bookmarks_users`.`itemtype`
107-
AND `glpi_bookmarks`.`id` = `glpi_bookmarks_users`.`bookmarks_id`
108-
AND `glpi_bookmarks_users`.`users_id` = '".Session::getLoginUserID()."')
109-
WHERE `glpi_bookmarks`.`is_private`='1'
110-
AND `glpi_bookmarks`.`users_id`='".Session::getLoginUserID()."'
111-
OR `glpi_bookmarks`.`is_private`='0' ".
112-
getEntitiesRestrictRequest("AND", "glpi_bookmarks", "", "", true);
102+
$query = "SELECT `glpi_savedsearches`.*,
103+
`glpi_savedsearches_users`.`id` AS IS_DEFAULT
104+
FROM `glpi_savedsearches`
105+
LEFT JOIN `glpi_savedsearches_users`
106+
ON (`glpi_savedsearches`.`itemtype` = `glpi_savedsearches_users`.`itemtype`
107+
AND `glpi_savedsearches`.`id` = `glpi_savedsearches_users`.`savedsearches_id`
108+
AND `glpi_savedsearches_users`.`users_id` = '".Session::getLoginUserID()."')
109+
WHERE `glpi_savedsearches`.`is_private`='1'
110+
AND `glpi_savedsearches`.`users_id`='".Session::getLoginUserID()."'
111+
OR `glpi_savedsearches`.`is_private`='0' ".
112+
getEntitiesRestrictRequest("AND", "glpi_savedsearches", "", "", true);
113113

114114
if ($result = $DB->query($query)) {
115115
if ($DB->numrows($result)) {
116+
Ajax::createSlidePanel(
117+
'showSavedSearches',
118+
[
119+
'title' => __('Saved searches'),
120+
'url' => $CFG_GLPI['root_doc'] . '/ajax/savedsearch.php?action=show',
121+
'icon' => '/pics/menu_config.png',
122+
'icon_url' => SavedSearch::getSearchURL(),
123+
'icon_txt' => __('Manage saved searches')
124+
]
125+
);
116126
echo '<li class="' . ($activeMenuItem == self::MENU_BOOKMARKS ? 'plugin_formcreator_selectedMenuItem' : '') . '">';
117127
Ajax::createIframeModalWindow('loadbookmark',
118-
$CFG_GLPI["root_doc"]."/front/bookmark.php?action=load",
119-
['title' => __('Load a bookmark'),
128+
$CFG_GLPI["root_doc"]."/front/savedsearch.php?action=load",
129+
['title' => __('Load a saved search'),
120130
'reloadonclose' => true]);
121-
echo '<a href="#" onclick="$(\'#loadbookmark\').dialog(\'open\');">';
122-
echo '<span class="fa fa-star fc_list_icon" title="'.__('Load a bookmark').'"></span>';
123-
echo '<label>'.__('Load a bookmark').'</label>';
131+
echo '<a href="#" id="showSavedSearchesLink">';
132+
echo '<span class="fa fa-star fc_list_icon" title="'.__('Load a saved search').'"></span>';
133+
echo '<label>'.__('Load a saved search').'</label>';
124134
echo '</a>';
125135
echo '</li>';
126136
}

0 commit comments

Comments
 (0)