Oliver Walters
c0a18ef244
Merge remote-tracking branch 'upstream/master'
2020-10-19 00:03:15 +11:00
Oliver
529c4052ff
Merge pull request #1038 from mpdgraev/fix_int_barcode
...
fix error when submitting some non-dict barcodes
2020-10-19 00:01:38 +11:00
Oliver
7edd08035f
Merge pull request #1049 from SchrodingersGat/api-default-location
...
Update creation of StockItem via API
2020-10-18 22:49:09 +11:00
Oliver Walters
3c175a6c8d
Update creation of StockItem via API
...
- If no location is specified, but a default location exists for the part, use that
- If a location is specified (even if it is null) then the specified value is used instead
2020-10-18 22:24:45 +11:00
Oliver
83077514cb
Merge pull request #1041 from eeintech/api_default_location
...
Added part 'default_location' to serializer
2020-10-18 22:01:35 +11:00
Oliver
4d4f0e5cfc
Merge pull request #1044 from eeintech/stock_permissions
...
Fixed insertion of backslash in the Stock barcode button group
2020-10-18 21:11:09 +11:00
Oliver Walters
1ec6bc86d1
Merge remote-tracking branch 'upstream/master'
2020-10-18 20:14:36 +11:00
eeintech
dbee26aaad
Fixed insertion of backslash in the barcode button group
2020-10-13 10:29:34 -05:00
eeintech
3143242d13
Added category 'default_location' to serializer
2020-10-12 13:14:24 -05:00
eeintech
eb98496a79
Added part 'default_location' to serializer
2020-10-12 07:25:32 -05:00
mpdgraev
f1f31a1338
fix error caused by assumption that json.loads() returns an object with a .keys() function
2020-10-09 16:32:54 +02:00
Oliver
ca8472ac23
Merge pull request #1037 from SchrodingersGat/tz-support
...
Add support for setting timezone in config.yaml
2020-10-08 21:35:36 +11:00
Oliver Walters
3d60bccae0
Add support for setting timezone in config.yaml
2020-10-08 21:02:38 +11:00
Oliver Walters
731ce6c342
Merge remote-tracking branch 'inventree/master'
2020-10-08 18:01:40 +11:00
Oliver
26ee3032f6
Merge pull request #1036 from SchrodingersGat/bom-quantity-export
...
Normalize quantity field when exporting BOM
2020-10-08 14:21:50 +11:00
Oliver Walters
8b16304e84
Custom 404 page
2020-10-08 14:09:08 +11:00
Oliver Walters
b595f3b732
Normalize quantity field when exporting BOM
2020-10-08 14:05:55 +11:00
Oliver Walters
8ffb7a7ced
Merge remote-tracking branch 'inventree/master'
2020-10-08 14:01:04 +11:00
Oliver
305920d1ac
Merge pull request #1030 from eeintech/stock_permissions
...
Stock permissions
2020-10-07 14:11:52 +11:00
Oliver
ec4bc357df
Merge pull request #1031 from eeintech/fix_superuser_permission
...
Fixed context permissions for superuser with no group assigned
2020-10-07 13:40:59 +11:00
eeintech
1ce2166843
Fixed context permissions for superuser with no group assigned
2020-10-06 09:59:51 -05:00
eeintech
5bcf8529ff
Only users with Part view permission have part URL shown
2020-10-06 09:16:38 -05:00
eeintech
e4ce19d22a
Added Test user and all permissions
2020-10-06 09:02:10 -05:00
eeintech
095cfe9845
Updated Stock permission views and templates
2020-10-06 08:55:40 -05:00
Oliver Walters
e69cab03cb
Merge branch 'master' of https://github.com/SchrodingersGat/InvenTree
2020-10-06 22:34:50 +11:00
Oliver Walters
745b745ce4
Merge remote-tracking branch 'inventree/master'
2020-10-06 22:34:42 +11:00
Oliver
279b50d977
Merge pull request #1029 from SchrodingersGat/sales-order-permissions
...
Sales order permissions
2020-10-06 20:44:01 +11:00
Oliver Walters
8b37229e4b
The real translations are the ones we made along the way
2020-10-06 20:31:38 +11:00
Oliver Walters
b80e4302ba
Update permissions for build app
2020-10-06 20:29:16 +11:00
Oliver Walters
2325b1e4ba
Unit test fixes
2020-10-06 20:10:14 +11:00
Oliver Walters
9abb211cdf
Update template permissions
2020-10-06 20:09:55 +11:00
Oliver Walters
1c97aaf87a
Set permissions for order views
2020-10-06 19:46:53 +11:00
Oliver
606c62078f
Merge pull request #1024 from SchrodingersGat/part-permissions
...
Permissions
2020-10-06 18:29:05 +11:00
Oliver Walters
ab454e5ba4
More template changes: perms -> roles
2020-10-06 16:46:13 +11:00
Oliver Walters
88f73443ee
Yet more style fixes
2020-10-06 16:43:39 +11:00
Oliver Walters
77a2b6de8b
Merge branch 'part-permissions' of https://github.com/SchrodingersGat/InvenTree into part-permissions
2020-10-06 16:03:33 +11:00
Oliver Walters
b3e4efd96e
Unit testing fixes
2020-10-06 16:03:19 +11:00
Oliver
e076470305
Merge branch 'master' into part-permissions
2020-10-06 12:35:45 +11:00
Oliver Walters
d691b15f4b
Fix conflicts
2020-10-06 12:34:30 +11:00
Oliver Walters
11d31960c7
Change modal form permissions to use new "role" strategy
2020-10-06 11:42:16 +11:00
Oliver Walters
c740cce5e4
PEP fixes
2020-10-06 11:31:04 +11:00
Oliver Walters
dc2c9aa662
Add InvenTreeRoleMixin
...
- Simplifies permission requirements for views
- e.g. 'part.view' rather than 'part.view_partcategory'
2020-10-06 11:29:38 +11:00
Oliver Walters
d2e2e7511f
Update templates: Change perms to roles
2020-10-06 10:07:39 +11:00
Oliver Walters
fa21d66c41
Fix logic for global context object 'roles'
...
- User may be a part of multiple groups
- Roles are additive across groups
2020-10-06 09:54:37 +11:00
Oliver Walters
23aee234f0
Change index page to use roles rather than perms to determine user permissions
2020-10-06 09:32:05 +11:00
Oliver Walters
556ffa1099
Change label for permissions to match django permission names
2020-10-06 09:28:05 +11:00
Oliver Walters
8b2189daca
Add global context 'roles'
...
- Access via template e.g. {% if roles.part.view %}
- Always True if the user is a superuser
2020-10-06 09:27:22 +11:00
Oliver
e74bfb90a5
Merge pull request #1025 from eeintech/fixed_group_redundant_saves
...
Fixed Group model permissions redundant saves
2020-10-06 07:40:44 +11:00
eeintech
d980da7247
Fixed permission assign test unit
2020-10-05 10:52:47 -05:00
eeintech
c910307ce5
Only saving Group model rulesets on instance creation and when inlines are saved
2020-10-05 10:04:54 -05:00
