Commit Graph

124 Commits

Author SHA1 Message Date
Silversthorn
3b4253de9b Fixing get_authorized_server 2022-05-26 23:19:59 +02:00
Silversthorn
99b28efd33 Merge branch 'dev' into dev-StatsDBImprovement 2022-05-26 15:39:52 +02:00
Silversthorn
8423cc24c1 I'm breaking/fixing stuff 2022-05-26 14:50:20 +02:00
Andrew
b0b9936df7 Merge branch 'bugfix/stats-db-select' into 'dev'
Get rid of the stats database proxy

See merge request crafty-controller/crafty-4!276
2022-05-25 18:29:23 +00:00
Silversthorn
5a1353373a trying something new 2022-05-25 15:54:35 +02:00
luukas
fae4aeb492
Fix CQ C0412 2022-05-25 14:16:14 +03:00
luukas
cf2ff2f2d5
Try to get rid of database_stats_proxy 2022-05-25 14:00:22 +03:00
luukas
57ef5e27dd
Add route for viewing user Crafty permissions
The route includes the permission mask, counters and limits
2022-05-25 00:55:49 +03:00
luukas
afdffcd836
Optimize get_user_permissions_mask 2022-05-23 23:03:50 +03:00
luukas
0d62223982 Merge branch 'dev' into bugfix/api-v2-bugfixes 2022-05-23 20:20:49 +03:00
Iain Powrie
da483b9291 Merge branch 'bug/pretzel-database-exit' into 'dev'
Fix error where database atomic is not needed

See merge request crafty-controller/crafty-4!269
2022-05-23 10:05:46 +00:00
Iain Powrie
f01f04ef97 Merge branch 'merge/cleanup-nosquash' into 'dev'
New merge request for cleanup

See merge request crafty-controller/crafty-4!268
2022-05-23 10:01:40 +00:00
Andrew
f099639cc6 Fix error where database atomic is not needed 2022-05-21 14:26:58 -04:00
luukas
ed9d994083
Fix linting in models/crafty_permissions.py 2022-05-20 23:23:18 +03:00
luukas
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash 2022-05-20 22:04:41 +03:00
luukas
1b059b24df
Update get_*_column functions
Use getattr instead of model_to_dict in single columns. We might want to
change the functions later on so peewee's ForeignKeyField primary key
shorthand like model.server_id instead of model.server.server_id
will work.

This will very likely increase performance of the get_*_column functions
due to not having to call the model_to_dict function from Peewee's
helper library.
2022-05-20 13:15:50 +03:00
Iain Powrie
379f680312 Merge branch 'bug/pretzel-stats-db-name' into 'dev'
Change naming of servers stats to generic name

See merge request crafty-controller/crafty-4!264
2022-05-19 21:13:07 +00:00
amcmanu3
ca170b86e0 Change naming of servers stats to generic name 2022-05-19 12:14:30 -04:00
Zedifus
4a83aaac0e Fix W0404 & C0412 Lint issues 2022-05-18 23:14:00 +01:00
Andrew
b7780682d5 Merge branch 'dev' into 'merge/api-v2'
# Conflicts:
#   app/classes/controllers/crafty_perms_controller.py
2022-05-18 21:56:39 +00:00
luukas
6407900609 Merge branch 'dev' into experimental/lukas-cleanup 2022-05-19 00:52:59 +03:00
Andrew
ca73a5f60b Merge branch 'dev' into 'experimental/feature/permission-matrix'
# Conflicts:
#   app/classes/web/panel_handler.py
2022-05-18 20:47:43 +00:00
amcmanu3
12390306fd Add permissions checks for quantity for users/role
Remove the ability to add quantities for general users.
2022-05-18 14:33:22 -04:00
luukas
74198ff81c Add a try..except to audit log broadcast 2022-05-18 16:51:46 +03:00
luukas
d67711e898 Fix cq degradation: C0411 2022-05-18 13:04:38 +03:00
luukas
7c85496eb8 Clean up enum-related functions 2022-05-18 01:55:05 +03:00
luukas
559a345f25 Merge branch 'dev' into merge/api-v2 2022-05-18 01:49:19 +03:00
luukas
8737c15fcf Add a permission matrix to the role add and edit 2022-05-18 01:09:58 +03:00
luukas
42af86b6f7 Merge branch 'dev' into experimental/lukas-cleanup 2022-05-17 21:21:47 +03:00
luukas
d83b964267 Improve server permission related functions 2022-05-16 18:01:15 +03:00
luukas
cd87a63f1e Improve permission related functions 2022-05-16 17:52:09 +03:00
luukas
d415c27a89 Make add_or_update_user more efficient with upsert 2022-05-16 17:15:46 +03:00
luukas
8d2f4ba32e Make get_all_permission_quantity_list dynamic 2022-05-16 17:10:57 +03:00
luukas
fbf820fd38 Make some model removals way more efficient 2022-05-16 01:18:08 +03:00
luukas
65ba65a67d Make model *_exists functions way more efficient 2022-05-16 01:12:03 +03:00
luukas
0115421243 Make queries narrower 2022-05-16 01:02:17 +03:00
luukas
27d310e2de Declutter set()s 2022-05-16 00:55:22 +03:00
luukas
930c6936d9 Add more advanced role APIs 2022-05-10 02:08:49 +03:00
luukas
bf59e2de6c Add and fix API v2 and db
* Add basic role routes
* Add API v2 404 handler
* Add API v2 home handler pointing to the wiki
* Add tons more todos
* Add get_*_columns and get_*_column functions for many db models
* Modify and add tons of model and controller functions
2022-05-08 00:07:55 +03:00
luukas
721c9cfe12 Add the server creation endpoint 2022-05-05 14:02:23 +03:00
luukas
53459d83dc Merge branch 'feature/api-v2' into merge/api-v2 2022-05-05 03:32:09 +03:00
Silversthorn
84078935e8 Sorry, I forgot this one :/ 2022-04-28 22:40:27 +02:00
Silversthorn
0dcdc8ffc7 pylint happy ? ^^ 2022-04-28 22:40:24 +02:00
Silversthorn
16bbac7fd6 Moving Server Stats DB to Server Folder 2022-04-28 22:40:15 +02:00
Andrew
2dc85e6f27 Add table name for audit_log 2022-04-14 19:34:30 -04:00
luukas
1aa0d65cf7 Merge branch feature/external-frontend to feature/api-v2 without the frontend 2022-04-14 15:33:53 +03:00
Zedifus
92c8fc04f3 Refactor to standardize class/variable naming 2022-04-14 03:10:25 +01:00
Andrew
3711c94ffe Beef up security on API 2022-04-12 21:52:40 -04:00
Andrew
73b3571606 Appease the linter 2022-04-12 19:22:57 -04:00
Zedifus
19f2429a4c Fix formatting to comply with Black 2022-04-11 11:08:36 +01:00