Isaac Connor
e33b41745d
Merge branch 'master' into replace_function_concept
2022-02-27 14:04:01 -05:00
Isaac Connor
1d15de0534
Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
2022-02-27 14:03:48 -05:00
Isaac Connor
13251b133a
Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
2022-02-27 14:03:37 -05:00
Isaac Connor
47fae7a296
spacing, improve debug
2022-02-26 19:18:28 -05:00
Isaac Connor
6fc5803e16
Add another clearInterval to prevent looping during window.location
2022-02-25 15:54:56 -05:00
Isaac Connor
9b0714d20d
Fix use of value instead of val in filter term
2022-02-25 14:14:02 -05:00
Isaac Connor
813fd36b0a
clearInterval when location.replacing so that timer stops. Prevents infinite loop
2022-02-25 14:13:18 -05:00
Ben Dailey
b2428b5522
Merge branch 'master' into lazy-load-images
2022-02-22 08:47:26 -05:00
Isaac Connor
831dca814f
Include EndDateTimeShort in event stats
2022-02-22 08:31:41 -05:00
Isaac Connor
dfb6a96b42
Handle empty endtime more gracefully. If there is a next event just jump to it.
2022-02-22 08:31:41 -05:00
Isaac Connor
959b08f46a
Include EndDateTimeShort in event ajax response
2022-02-22 08:31:41 -05:00
Isaac Connor
d7c8e32ec9
Remove non-translations
2022-02-22 08:31:41 -05:00
Isaac Connor
88a68af775
DefaultCodec is for event view, not live
2022-02-22 08:31:41 -05:00
Isaac Connor
cf7b3b9f9f
DefaultCodec is for event view, not live
2022-02-22 08:31:41 -05:00
Isaac Connor
3a2e5a580b
Debug the contents of REQUEST on every hit.
2022-02-22 08:31:41 -05:00
Isaac Connor
5aef8408a4
serialize form instead of just passing filter id because the modal can now handle unsaved filters
2022-02-22 08:31:41 -05:00
Isaac Connor
b32164e992
Add handling of NOT IN and =\[\] and \!\[\]
2022-02-22 08:31:41 -05:00
Ben Dailey
e4f5f59e8d
3 more img tags
2022-02-22 08:31:41 -05:00
Ben Dailey
ce267c7e3c
Most programmatic images are lazy.
2022-02-22 08:31:02 -05:00
Isaac Connor
a40b305065
Merge branch 'master' into replace_function_concept
2022-02-20 09:52:03 -05:00
Isaac Connor
1a54a96c04
Improve title on alarm buttons when we don't have permission. Move onclick from data-on-click to setup in initPage only if permitted
2022-02-18 17:11:18 -05:00
Isaac Connor
002b2c39aa
fix button assignments. Don't abort ajax, as it might be important
2022-02-18 17:11:18 -05:00
Isaac Connor
adf8413333
Include EndDateTimeShort in event stats
2022-02-17 13:31:25 -05:00
Isaac Connor
8dedac1a21
Handle empty endtime more gracefully. If there is a next event just jump to it.
2022-02-17 13:30:50 -05:00
Isaac Connor
909c0e903f
Include EndDateTimeShort in event ajax response
2022-02-17 13:30:01 -05:00
Isaac Connor
cd2c977ed8
Merge branch 'master' into replace_function_concept
2022-02-16 14:25:38 -05:00
Isaac Connor
f3d3cad419
Remove non-translations
2022-02-16 09:59:48 -05:00
Isaac Connor
055414c778
DefaultCodec is for event view, not live
2022-02-16 09:59:48 -05:00
Isaac Connor
93ab345a3a
DefaultCodec is for event view, not live
2022-02-16 09:59:48 -05:00
Isaac Connor
efc1ec770c
Debug the contents of REQUEST on every hit.
2022-02-15 18:52:46 -05:00
Isaac Connor
b67e7b8111
serialize form instead of just passing filter id because the modal can now handle unsaved filters
2022-02-15 18:52:46 -05:00
Isaac Connor
8b14885541
Add handling of NOT IN and =\[\] and \!\[\]
2022-02-15 18:52:46 -05:00
Isaac Connor
2bc0ec269a
Merge branch 'master' into replace_function_concept
2022-02-15 17:02:03 -05:00
Isaac Connor
a149fa37fc
Make filter debug modal work on non-saved filter
2022-02-15 10:37:14 -05:00
Isaac Connor
59039de985
Use =[] instead of IN as operator. Fixes #3432
2022-02-15 10:23:30 -05:00
Isaac Connor
554840d811
Revert "Add SQL opTypes IN, NOT IN to filter view, #3432"
2022-02-15 10:07:48 -05:00
Jernej Jakob
13f2076dc9
Add SQL opTypes IN, NOT IN to filter view, #3432
...
This possibly fixes the issue where changing the filter for an event
view via the filter button would produce invalid SQL and SQL errors.
web_php[43835].ERR [1.2.3.4] [SQL-ERR 'SQLSTATE[HY000]: General error: 4078 Illegal parameter data types int and row for operation '='', statement was 'SELECT E.*, M.Name AS Monitor FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE ( ( E.StartDateTime >= '2022-02-14 00:47:41'
and E.StartDateTime <= '2022-02-14 11:47:41' )
and E.MonitorId = ('1','3')
) ORDER BY E.StartDateTime DESC' params:] at /usr/share/zoneminder/www/includes/database.php line 161
When in the events view, clicking the filterBtn sends us to the filter view with this query term (url-decoded):
&filter[Query][terms][2][attr]=MonitorId&filter[Query][terms][2][op]=IN&filter[Query][terms][2][val]=1,3&filter[Query][sort_asc]=0
but the filter view displays this as "equals", not "in set", because it doesn't know IN from opTypes, only =[].
2022-02-15 14:15:08 +01:00
Isaac Connor
c8a2b6d679
Merge branch 'master' into replace_function_concept
2022-02-14 12:03:25 -05:00
Isaac Connor
b6d2d96d11
Remove offending extra comma
2022-02-14 09:47:59 -05:00
Isaac Connor
485cc26065
Merge branch 'master' into replace_function_concept
2022-02-12 22:17:47 -05:00
Isaac Connor
f47aa98b43
html is not a global.. confusing yes.
2022-02-12 22:17:03 -05:00
Isaac Connor
0e2f2cf572
Merge branch 'timeline_multi_monitor'
2022-02-11 18:08:41 -05:00
Isaac Connor
94bc40a6cf
Split the data by monitor and display a monitor image/info for each monitor.
2022-02-11 18:06:42 -05:00
Isaac Connor
3250e0edfe
simplify some code, pass around zm_event json objects instead of event_id. Each monitor has it's own image so when loading event data put it into a div/img referenced by monitor Id
2022-02-11 18:06:08 -05:00
Isaac Connor
4cc82e24f3
convert some tags to classes instead of ids. Add margin: 0 auto so that monitor images are centered
2022-02-11 18:04:54 -05:00
Isaac Connor
cb80283398
Merge branch 'master' into timeline_multi_monitor
...
update code to use jquery instead of mootools
when only viewing 1 monitor, split view in half
load first event image righ toff the bat
2022-02-11 18:03:35 -05:00
Isaac Connor
b700e7b5ce
Merge pull request #3424 from r01k/master
...
Fixed in export.php "Class 'Filter' not found" and SQL query with wrong syntax
2022-02-10 21:39:50 -05:00
Isaac Connor
bcd0b6430b
Convert Fatal()s to Errors() which is really more appropriate anyways. Maybe Fixes #3426
2022-02-08 18:12:06 -05:00
Isaac Connor
b866888062
Change title of settings button to give an indication WHY it isn't enabled
2022-02-08 17:52:59 -05:00
Isaac Connor
9fee64b62f
detaint language file.
2022-02-08 14:31:01 -05:00