Skip to content

Commit 9e79dfa

Browse files
committed
add exception for zoomed/custom timespaned favourite graphs
1 parent 3a6f9c0 commit 9e79dfa

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

include/actions.php

+9-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@
7676
WHERE user_id= ? AND fav_graph_id= ? AND fav_graph_timespan= ?',
7777
array($_SESSION['sess_user_id'],get_request_var('graph_id'),$_SESSION['sess_current_timespan']));
7878
} else { // add to fav
79+
if ($_SESSION['sess_current_timespan'] == 0) {
80+
raise_message('custom_error',__('Cannot add zoomed or custom timespaned graph, changing timespan to Last half hour'));
81+
$span = 1;
82+
}
83+
else {
84+
$span = $_SESSION['sess_current_timespan'];
85+
}
86+
7987
$prio = db_fetch_cell_prepared('SELECT max(priority)+1
8088
FROM plugin_intropage_panel_data
8189
WHERE user_id = ?',
@@ -84,7 +92,7 @@
8492
db_execute_prepared('REPLACE INTO plugin_intropage_panel_data
8593
(user_id, panel_id, fav_graph_id, fav_graph_timespan, priority)
8694
VALUES (?, "favourite_graph", ?, ?, ?)',
87-
array($_SESSION['sess_user_id'],get_request_var('graph_id'),$_SESSION['sess_current_timespan'], $prio));
95+
array($_SESSION['sess_user_id'],get_request_var('graph_id'), $span, $prio));
8896

8997
$id = db_fetch_insert_id();
9098
db_execute_prepared('INSERT INTO plugin_intropage_panel_dashboard

include/functions.php

+6-2
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,13 @@ function intropage_graph_button($data) {
361361
WHERE user_id= ?', array($_SESSION['sess_user_id'])) == 'on') {
362362
$local_graph_id = $data[1]['local_graph_id'];
363363

364-
if (db_fetch_cell_prepared('SELECT COUNT(*) FROM plugin_intropage_panel_data
364+
365+
if ($_SESSION['sess_current_timespan'] == 0) { // zoom or custom timespan
366+
$fav = '<i class="fa fa-eye-slash" title="' . __esc('Cannot add to Dashboard. Custom timespan.', 'intropage') . '"></i>';
367+
}
368+
else if (db_fetch_cell_prepared('SELECT COUNT(*) FROM plugin_intropage_panel_data
365369
WHERE user_id= ? AND fav_graph_id= ? AND fav_graph_timespan= ?',
366-
array($_SESSION['sess_user_id'],$local_graph_id,$_SESSION['sess_current_timespan'] )) > 0) { // already fav
370+
array($_SESSION['sess_user_id'],$local_graph_id,$_SESSION['sess_current_timespan'])) > 0) { // already fav
367371
$fav = '<i class="fa fa-eye-slash" title="' . __esc('Remove from Dashboard', 'intropage') . '"></i>';
368372
} else { // add to fav
369373
$fav = '<i class="fa fa-eye" title="' . __esc('Add to Dashboard', 'intropage') . '"></i>';

0 commit comments

Comments
 (0)