Isaac Connor
|
0515a1ba74
|
implode the output from zmu to fix php complaint abou array to string conversion
|
2022-11-17 14:53:56 -05:00 |
|
Isaac Connor
|
e4e8560722
|
Fix eslint. Fix use of fail instead of error in ajax requests
|
2022-11-16 10:50:48 -05:00 |
|
Isaac Connor
|
d63edde294
|
Make .form-group styles export page specific because they are affecting modals
|
2022-11-16 10:14:54 -05:00 |
|
Isaac Connor
|
9fe7ba8c8c
|
Cleanup the state modal. Fix form post
|
2022-11-16 10:14:24 -05:00 |
|
Isaac Connor
|
f9a3c5fc83
|
Don't log error when ignoring action if it is an ajax request
|
2022-11-16 09:28:33 -05:00 |
|
Isaac Connor
|
22df344880
|
Merge branch 'master' of ../imouse
|
2022-11-16 09:23:05 -05:00 |
Isaac Connor
|
57e70e1f1d
|
Switch to post methods for ajax actions on selected events. Can't use get because with a lot of selected events, the request URI gets too long.
|
2022-11-16 09:22:49 -05:00 |
|
Isaac Connor
|
0cee0561a4
|
Change form to post for delete
|
2022-11-16 09:01:30 -05:00 |
|
Isaac Connor
|
89c6e22052
|
Remove check for ZM_WEB_DIR is writable.
|
2022-11-15 14:44:45 -05:00 |
|
Isaac Connor
|
97e464b342
|
Comment out debugging
|
2022-11-15 14:17:30 -05:00 |
|
Isaac Connor
|
902f7d430f
|
Add error message when minTime >= maxTime
|
2022-11-15 12:48:33 -05:00 |
|
Isaac Connor
|
6d7a5cbcea
|
Fix infinite recursion in montagereview
|
2022-11-15 12:48:23 -05:00 |
|
Isaac Connor
|
a6856c4f94
|
Merge pull request #3630 from mispdev/fix_db_utf8_connection
Set web backend DB connection to UTF8
|
2022-11-12 15:34:03 -05:00 |
|
Isaac Connor
|
a712ad0605
|
Merge ../ZoneMinder.connortechnology
|
2022-11-10 18:10:08 -05:00 |
|
Isaac Connor
|
3e95134448
|
Remove Debug
|
2022-11-10 18:07:40 -05:00 |
|
Isaac Connor
|
69d835b5d2
|
Fix height of search text input to match buttons
|
2022-11-10 18:06:38 -05:00 |
|
Isaac Connor
|
37f4c1b454
|
Move title to Monitor div instead of container so that the title doesn't act on events list
|
2022-11-10 18:06:21 -05:00 |
|
Isaac Connor
|
7ac8a47f3e
|
Fix 500 on saving user due to incorrect scope of g. Fixes #3629
|
2022-11-10 17:15:39 -05:00 |
Michael
|
0d6b8d1de3
|
Set web backend db connection to utf8
|
2022-11-10 18:57:35 +01:00 |
|
Isaac Connor
|
4814eaa2df
|
Don't use old MonitorIds filter
|
2022-11-03 18:29:03 -04:00 |
|
Isaac Connor
|
d583c10fa6
|
Return events when limit is > the # of events returned
|
2022-11-03 17:48:39 -04:00 |
|
Isaac Connor
|
4d3dfd84f4
|
add includes/Monitor_Permission.php
|
2022-11-03 12:24:14 -04:00 |
|
Isaac Connor
|
59898b9a0c
|
Fix eslint
|
2022-11-02 17:47:12 -04:00 |
|
Isaac Connor
|
24ac383f97
|
spacing
|
2022-11-02 17:44:42 -04:00 |
|
Isaac Connor
|
160b61a9a0
|
Updates for added effecivePermission calculation
|
2022-11-02 17:44:34 -04:00 |
|
Isaac Connor
|
e3b1dd1dd0
|
rough in updateEffectivePermissions
|
2022-11-02 17:43:48 -04:00 |
|
Isaac Connor
|
6d31800419
|
Add monitors and groups info to javascript side
|
2022-11-02 17:43:34 -04:00 |
|
Isaac Connor
|
ea6d999654
|
Must use false === when using array_search because first element returns 0
|
2022-11-02 17:42:32 -04:00 |
|
Isaac Connor
|
7e82159f1a
|
Remove bootstrap calls=text-right crap. Replace with css
|
2022-11-02 15:53:55 -04:00 |
|
Isaac Connor
|
253011a453
|
Set styles for Name/th column of user edit table
|
2022-11-02 15:53:32 -04:00 |
|
Isaac Connor
|
135c52f3ec
|
Fix Group_Permissions()
|
2022-11-02 15:53:13 -04:00 |
|
Isaac Connor
|
ab3e1811d3
|
fix canEdit, rough in effectPermission
|
2022-11-02 15:52:37 -04:00 |
|
Isaac Connor
|
616734a041
|
Move API option to left column, replace MOnitorIds select with an entire section dedicated to specific monitor permissions
|
2022-11-02 13:26:37 -04:00 |
|
Isaac Connor
|
b1579d953d
|
Clear br.clear as well as div
|
2022-11-02 13:26:37 -04:00 |
|
Isaac Connor
|
b066e936c7
|
Apply styles to Monitor Permissions table
|
2022-11-02 13:26:34 -04:00 |
|
Isaac Connor
|
63769a2082
|
Fix missing )
|
2022-11-02 13:26:34 -04:00 |
|
Isaac Connor
|
3c36233dd8
|
Put in all the new logic for visibleMonitor and editableMonitor referencing Monitor_Permissions and Group_Permissions
|
2022-11-02 13:25:53 -04:00 |
|
Isaac Connor
|
68bf964eec
|
Add saving of Monitor_Permissions
|
2022-11-02 13:25:53 -04:00 |
|
Isaac Connor
|
b7490c754b
|
Rough in Group_Permission and Monitor Permissions loading functions.
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
24a83efa79
|
Improve Monitor canView and canEdit. If the user is not specified, use the cached auth routines in includs/auth.php. Otherwise replicate the logic for the specfied user.
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
16b5551a4a
|
Always return a Group_Permission in Permission()
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
121e864dde
|
Continue roughing in Group_Permission logic
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
a891b528d1
|
Use Monitor::canView in Event::canView
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
7a39433db7
|
update code to use Group_Permission::Permission
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
2ee142813e
|
start to rough in an editable monitor function
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
d8175126fd
|
I renamed the fields to user from newUser, so reflect that in the js validation
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
c6edb8d46a
|
Make Permission column wider to support the Inherit value
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
79f5d77fab
|
Add Permission saving to user view
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
3157510f23
|
Add Permission property
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
9df7283358
|
Rough in the boilerplate for retrieving Permissions on Groups
|
2022-11-02 12:37:46 -04:00 |