Commit Graph

7228 Commits

Author SHA1 Message Date
Isaac Connor cf08010ebe Fix redirect on zone editing 2020-11-18 13:04:56 -05:00
Andrew Bauer a2b5271835 fix copy/paste typo 2020-11-14 17:34:59 -06:00
Andrew Bauer 0ffb5e153c modify FilterTerm to support Frames view searches 2020-11-14 17:33:18 -06:00
Andrew Bauer f3756def08 deploy server side pagination for frames view 2020-11-14 14:45:22 -06:00
Andrew Bauer 9aa6fea6a3 frames view server pagination WIP 2020-11-14 14:19:28 -06:00
Andrew Bauer f88d721ae3 fix issue with events view and ALL pagination 2020-11-14 10:27:33 -06:00
Isaac Connor f32d10a1ab Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-13 17:16:13 -05:00
Isaac Connor 66f7cc55dc Spacing code comments, quotes 2020-11-13 17:05:23 -05:00
Andrew Bauer 52e747791d rough in frames server pagination backend 2020-11-13 12:34:01 -06:00
Isaac Connor a581cb9de1 Make various text input options be 90% 2020-11-13 10:18:35 -05:00
Isaac Connor 70ebd570e0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-13 09:52:10 -05:00
Isaac Connor 3cf31435a7 fix next/prev buttons by correcting the sort_field when it is StartTime or EndTime 2020-11-13 09:51:54 -05:00
Andrew Bauer c0225a35aa use different variable assignment for clarity 2020-11-13 07:24:17 -06:00
Andrew Bauer a15c8ea7d8
Merge pull request #3072 from ZoneMinder/iconnor_ajax_event_changes
Rework code to use Filter methods to generate advanced search
2020-11-13 07:10:08 -06:00
Isaac Connor 95f8aad19b Fix detection of filter['id'] 2020-11-11 17:39:55 -05:00
Isaac Connor fe733fe1e6 Must use & instead of & in filter redirect 2020-11-11 17:39:37 -05:00
Isaac Connor 73e8c04b6f Fix encoding of = in filter['Id']. Fixes redirect after saving 2020-11-11 17:39:20 -05:00
Isaac Connor 52c7cc5869 reorganize code. Remove Server caching as it is done in Object.php. 2020-11-11 11:49:44 -05:00
Isaac Connor b4aacde5bf Remove debug. Auth is pretty solid these days 2020-11-10 13:15:46 -05:00
Isaac Connor 5b10fff2a0 Use cached objects when using new instead of only find_one 2020-11-10 13:14:36 -05:00
Isaac Connor f2630b8fbc Merge branch 'master' into move_event_totals_to_monitor_status 2020-11-06 14:17:23 -05:00
Isaac Connor 59403dc11b Move event stat totals to Monitor_Status. 2020-11-06 14:00:18 -05:00
Isaac Connor 6ed006bc60 rename StartTime and EndTime to StartDateTime and EndDateTime in the named query params 2020-11-06 12:25:04 -05:00
Isaac Connor 402b559b2c Add StartTime and EndTime virtual fields for backwards compatability 2020-11-06 11:15:12 -05:00
Isaac Connor 68cdd2123d Merge branch 'release-1.34' 2020-11-05 13:55:15 -05:00
Isaac Connor 746882ba85 Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070 2020-11-05 13:45:02 -05:00
Isaac Connor 7b8ee6af9f Rework code to use Filter methods to generate advanced search functionality. Reduces sql queries to 1 or 2, using count() to populate [total] and [totalNotFiltered]. Does pagination using array_splice instead of SQL queries. Will use more ram, but reduces db load. 2020-11-05 12:20:49 -05:00
Isaac Connor ee89eb45e6 Fix EndTime to EndDateTime 2020-11-04 18:39:02 -05:00
Isaac Connor e085e08caa Fix missed StartTime to StartDateTime 2020-11-04 18:27:51 -05:00
Isaac Connor 130588eb8f fix typos 2020-11-04 18:22:50 -05:00
Isaac Connor d37bce4e0e Fix missed StartTime to StartDateTime 2020-11-04 18:20:59 -05:00
Isaac Connor 289612a826 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-11-04 18:10:55 -05:00
Isaac Connor b17fa8f9c1 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:58:03 -05:00
Isaac Connor ce99a9456b Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:56:44 -05:00
Isaac Connor 68ad1cf1f7 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:56:37 -05:00
Isaac Connor 786e2fec92 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:56:27 -05:00
Isaac Connor af9e279f9e Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:55:27 -05:00
Isaac Connor d75e93249c Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:54:12 -05:00
Isaac Connor 9d22de98a3 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:53:45 -05:00
Isaac Connor 9e6a9cad80 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:53:17 -05:00
Isaac Connor 8029f59eac Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:52:50 -05:00
Isaac Connor 2d33dd5386 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:52:32 -05:00
Isaac Connor 0d404ac66f Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:50:45 -05:00
Isaac Connor 4731041a40 FS Storage DiskSpace isn't implemented. 2020-11-04 12:42:04 -05:00
Isaac Connor e67532ef76 implement is_valid_attr. Fix incorrect EventDiskspace vs FS DiskSpace. FS DiskSpace isn't implemented. DiskPercent is. 2020-11-04 12:40:43 -05:00
Isaac Connor 387b2b1fc2 add attr validation to addTerm. Add addTerms 2020-11-04 12:39:42 -05:00
Isaac Connor af399bb174 Reqiure Id to have a value not just be set 2020-11-04 09:18:41 -05:00
Isaac Connor 2c899bd3c5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-03 12:11:58 -05:00
Isaac Connor 6112db627c Even if we found the filter in the db, if it is present in the query string, update the object with the new values 2020-11-03 11:59:28 -05:00
Isaac Connor b2385ccecc colour match a:link to navbar colour. This has the effect of brightening up all links. 2020-11-03 11:53:15 -05:00