Commit Graph

1498 Commits

Author SHA1 Message Date
Isaac Connor 8bd958e91c pass querySep to querystring 2020-09-24 12:12:06 -04:00
Isaac Connor e47fa48a8e move parseFilterToTree from timeline_functions to Filter->tree(). Fix passing separator in querystring 2020-09-24 12:11:45 -04:00
Isaac Connor ed6d5a55a5 put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button 2020-09-22 14:33:26 -04:00
Isaac Connor 0aa0452b7e Use a redirect instead of just changing the view on monitor save. This fixes the reload issue 2020-09-22 14:05:37 -04:00
Isaac Connor 3e3af0bca5 Fix zmcontrol.pl command line to not use = to match with usage elsewhere 2020-09-21 11:24:17 -04:00
Isaac Connor 861ebedcae Implement a crude view for a failed db connection with a 30 second reload interval. 2020-09-21 11:15:34 -04:00
Andrew Bauer ec20fdf3ad convert function modal to ajax request 2020-09-19 10:18:59 -05:00
Andrew Bauer d2963fe28f convert donate modal to ajax request 2020-09-19 08:55:08 -05:00
Andrew Bauer 2757b74957 convert servermodal function to php file 2020-09-18 10:34:33 -05:00
Isaac Connor 29880cdab3 handle width options['width'] and options['height'] aren't set 2020-09-17 20:57:14 -04:00
Isaac Connor 006cc079c4 Rework action to use Zone class and just take a list of Zid's so that technically we can delete zones from multiple monitors at once. 2020-09-17 20:56:56 -04:00
Isaac Connor 1701089211 Add MonitorId to Zone fields and add Monitor() method 2020-09-17 20:56:21 -04:00
Isaac Connor 42dc4e46b1 add canEdit method to Monitor object 2020-09-17 20:56:04 -04:00
Isaac Connor 4a6743be3f turn off debug 2020-09-17 15:15:13 -04:00
Isaac Connor 123b2a4747 Change Event Diskspace case to not interfere with Filesystem DiskSpace 2020-09-17 15:14:54 -04:00
Isaac Connor d39beb5714 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-15 10:22:36 -04:00
Andrew Bauer accfd1191f update eventdetail modal 2020-09-15 09:20:38 -05:00
Isaac Connor fa1ade6b7b Fix obr getting cbr value 2020-09-15 10:11:07 -04:00
Isaac Connor ad0f8d674d sort_asc is a boolean. ZM_WEB_EVENT_SORT_ORDER is asc|desc 2020-09-14 15:13:41 -04:00
Isaac Connor ab8e2d2e6c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-14 14:05:02 -04:00
Isaac Connor 77fb533e48 Fix default value for AutoExecuteCmd 2020-09-14 14:04:36 -04:00
Andrew Bauer d2bc39f65f replace storage popup with modal 2020-09-14 09:50:04 -05:00
Andrew Bauer aa6bf31cbd pass OLANG as a function parm 2020-09-11 07:51:00 -05:00
Isaac Connor 3b7bde755e
Merge pull request #3041 from mnoorenberghe/unsafe_inline_backcompat
Drop support for CSP 1 browsers (with no nonce-* support)
2020-09-10 18:09:44 -04:00
Andrew Bauer 46d4f55b80 add makeHelpLink helper function 2020-09-10 17:06:27 -05:00
Matthew Noorenberghe f031ce9934 Drop support for CSP 1 browsers (with no nonce-* support)
This gets rid of console spew in modern browsers.
2020-09-10 16:25:43 -04:00
Isaac Connor c5e4a964cd quotes, spacing fix some functions that clearly no one uses 2020-09-05 12:49:14 -04:00
Isaac Connor 240f4ceabd Fix code warning if no value is selected in htmlSelect 2020-09-03 18:21:38 -04:00
Isaac Connor 47971bb8f5 Update function action to use Monitor object 2020-09-03 18:21:08 -04:00
Isaac Connor 6f5acece66 FIx Record Entry 2020-09-03 18:20:51 -04:00
Isaac Connor c934dee233 Do not allow the deleting of Archived Events 2020-09-03 17:02:48 -04:00
Isaac Connor 94c7708df5 Warn when the specified selected value isn't in the passed options. Don't default to adding id in htmlSelect. Shouldbe passed in behaviours 2020-09-03 10:42:33 -04:00
Isaac Connor fb9129a4d3 Add missing Mocord option 2020-09-03 10:40:10 -04:00
Isaac Connor b1d4115df8 Handle case where IN operator is used with 1 value 2020-09-02 17:55:06 -04:00
Isaac Connor 31e8270470 Do not set width and height of stream based on monitor size 2020-09-02 14:37:28 -04:00
Isaac Connor c0b54ee790 introduce connKey method. Use it to generate a connKey if one hasn't been assigned yet. 2020-09-02 13:56:55 -04:00
Isaac Connor 762bea0761 Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot. 2020-08-31 18:30:05 -04:00
Isaac Connor 9b36b68ccc Introduce a Group_Monitor class to ease loading this relationship 2020-08-31 18:28:53 -04:00
Isaac Connor cce0ab1464 pass params when loading Objects_Indexed_By_Id 2020-08-31 10:16:35 -04:00
Isaac Connor 4fcece6b69 Fixes to generating SQL for postSQL conditions. Now we will add the AND with a value of TRUE and a comment with the attr 2020-08-31 10:16:10 -04:00
Isaac Connor d0f1a2af80 Since monitor edit is no longer a popup, we need to redirect to console instead of none. 2020-08-28 10:22:28 -04:00
Isaac Connor 079d1be3b3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-28 09:52:34 -04:00
Isaac Connor b458a7c893 Redirect after save so that a reload doesn't redo the post 2020-08-27 17:20:24 -04:00
Isaac Connor 10d0ccf0ce fix use of ->value instead of ->val. Return 1 for the sql for a post-condition term 2020-08-27 17:15:33 -04:00
Isaac Connor d0f6f8755c Implement a remove_from_cache function so we can free mem for objects we are not interested in 2020-08-27 17:14:47 -04:00
Isaac Connor a5cef3e6d1 Need to put a 1 in the sql for post-sql conditions due to the cnj term 2020-08-27 17:14:16 -04:00
Isaac Connor 9fef228636 remove debug Warning 2020-08-27 13:38:13 -04:00
Isaac Connor 11f165a99f remove width and height from zms url. zms doesn't support them and having them in the url is confusing 2020-08-27 10:29:50 -04:00
Isaac Connor b451c323e9 remove debug code at Warning level 2020-08-26 18:40:31 -04:00
Andrew Bauer 8ba91db1fb make logout view a modal 2020-08-26 16:28:11 -05:00