inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-22 22:53:27 +00:00
Code Activity
3,649 Commits 10 Branches 164 Tags
8f6c26c7d32e4d2706257ac53bb7d7610ec5661e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 8f6c26c7d3 Merge remote-tracking branch 'upstream/master' 2020-10-05 19:50:45 +11:00
OliverandGitHub 731c796254 Merge pull request #1011 from SchrodingersGat/navbar-permissions 
Hide main elements of navigation bar based on user permissions
 2020-10-05 11:17:41 +11:00
OliverandGitHub dc41231fcc Merge pull request #1018 from SchrodingersGat/group-roles 
Roles and Permissions
 2020-10-05 11:16:52 +11:00
OliverandGitHub cc05220263 Merge pull request #1020 from SchrodingersGat/stock-building 
Add "is_building" field to StockItem model
 2020-10-05 10:08:40 +11:00
Oliver Walters 898c604b3b Fix incorrect permission names 
- Uses the app_model name, *NOT* the name of the database table
- Adds extra tests to ensure that permissions get assigned and removed correctly
 2020-10-05 08:55:15 +11:00
Oliver Walters 095ef51991 Cleanup unit testing 2020-10-05 08:29:36 +11:00
Oliver Walters bce7eb1aad update translation files 2020-10-05 01:02:36 +11:00
Oliver Walters 13cd8624b2 Fix permissions 2020-10-05 01:01:56 +11:00
Oliver Walters 48e050d317 Add some more unit tests and validation code for the StockItem model 
- Ensure that the build part matches the stockitem part!
 2020-10-05 00:49:00 +11:00
Oliver Walters 3ee7be1d58 Add "optional" field to BomItem 
- Defaults to False
- Indicates that the BomItem is "optional" for a build
- Will be used in the future when calculating if a Build output is fully allocated!
 2020-10-05 00:42:09 +11:00
Oliver Walters c1595396c4 Unit testing: fix PEP issues 2020-10-05 00:29:31 +11:00
Oliver Walters fe3a72c6cc Add some unit testing 2020-10-05 00:29:06 +11:00
Oliver Walters 26d113e8ad Update IN_STOCK_FILTER to reject stock items which have is_building set to True 2020-10-05 00:14:04 +11:00
Oliver Walters ee28b4eea5 Add "is_building" field to StockItem model 
- This will be set to TRUE until a stock item has been completed
 2020-10-05 00:12:42 +11:00
OliverandGitHub 7f3ce9b0b1 Merge pull request #1019 from SchrodingersGat/installed-stock-improvements 
Improvements for the "Installed Items" tab for StockItem display
 2020-10-05 00:09:23 +11:00
Oliver Walters 62734c4b72 Add a custom template for the install item form 2020-10-05 00:01:01 +11:00
Oliver Walters 3fe0886207 Remove a debug statement 2020-10-04 23:49:01 +11:00
Oliver Walters 852da6d696 Fix form validation 2020-10-04 23:48:15 +11:00
Oliver Walters 42a75a8238 Add hidden input to the InstallStockForm form 
- keeps track of "part" object
- so we can filter the stock_items queryset if the form validation fails
- Is there a more djangonic way of doing this??
 2020-10-04 23:45:52 +11:00
Oliver Walters 46f459b4c7 Better display of stock table 2020-10-04 23:34:02 +11:00
Oliver Walters b9291c6705 Improve transaction note recording for the StockItem model 2020-10-04 23:33:43 +11:00
Oliver Walters 824ce6778f Progress bar tweaks 
- If no maximum value supplied, just show the value (and fill to 100% width)
 2020-10-04 23:33:20 +11:00
Oliver Walters 3c5968ef1a Add subrow table to the "installed items" view 
Ah, javascript...
 2020-10-04 22:58:41 +11:00
Oliver Walters 9c27680202 Finish function to install stock item(s) 2020-10-04 21:32:21 +11:00
Oliver Walters 45c888e13d Custom cleaning for form 
Ok, looks like I've been doing this wrong the whole time!
The "djangonic" way is pretty cool
 2020-10-04 21:31:44 +11:00
Oliver Walters a686500df1 Calculate initial values for the view 2020-10-04 21:02:20 +11:00
Oliver Walters fd22e713ff Filter available stock items by Part reference 2020-10-04 20:50:06 +11:00
Oliver Walters f04977e7e1 Add form / view for installing a stock item into another stock item 2020-10-04 20:41:28 +11:00
Oliver Walters b467c8a1ef Add front-end functions to render an "installed stock" table 2020-10-04 15:17:46 +11:00
Oliver Walters b27f926310 Add ability to filter BOM API by "trackable" status of the sub_part object 2020-10-04 13:51:52 +11:00
Oliver Walters fb09f53dc9 Add missing migration file 2020-10-04 12:58:45 +11:00
Oliver Walters 929411e49a Remove "general" ruleset 2020-10-04 12:53:24 +11:00
Oliver Walters 31b699d521 Hide "user permissions" view from the admin interface 2020-10-04 12:47:19 +11:00
Oliver Walters cda52a58e3 Remove manual 'permissions' control from groups admin interface 
- Does not actually *do* anything any more as the RuleSet approach overrides it anyway
 2020-10-04 12:19:56 +11:00
Oliver Walters c19c014f55 Add or remove permissions from groups as defined by the RuleSet links 
- Only runs when the group is changed
- Does not add permissions if they already exist
- Does not remove permissions if they do not exist
 2020-10-04 12:18:31 +11:00
Oliver Walters d5c0c12d78 Add some more unit testing 
- ALL models must be covered by rulesets
- Added a RULESET_IGNORE list for models we do not want permissions for
 2020-10-04 11:03:14 +11:00
Oliver Walters c09b4980ad PEP fixes 2020-10-04 00:43:02 +10:00
Oliver Walters 1ded9e1fc0 Add a warning showing which databases tables are not covered by defined rulesets 2020-10-04 00:38:53 +10:00
Oliver Walters 6c2eb959a6 More unit testing 2020-10-04 00:34:22 +10:00
Oliver Walters 2039100d3e Add some unit testing 2020-10-04 00:24:48 +10:00
Oliver Walters 6bc5fe2497 Tab fix 2020-10-04 00:03:10 +10:00
Oliver Walters 9e4cc73b1c Add migration files 2020-10-04 00:01:18 +10:00
Oliver Walters 16f1b4c784 Add hook to update group permission roles 
(doesn't do anything yet)
 2020-10-03 23:45:24 +10:00
Oliver Walters bedda66949 Add custom admin view for the "Group" model 
- Ref: https://github.com/Microdisseny/django-groupadmin-users
- Adds ability to edit users within a particular group from the group admin page!
 2020-10-03 17:37:20 +10:00
OliverandGitHub d81aa5c051 Merge pull request #1017 from SchrodingersGat/admin-shell 
Add shell interface
 2020-10-03 16:24:55 +10:00
Oliver Walters c7403fd512 Add shell interface 2020-10-03 16:18:03 +10:00
OliverandGitHub e6526288cd Merge pull request #1013 from SchrodingersGat/next-available-fix 
Fix for "next avilable serial number" string
 2020-10-02 14:01:25 +10:00
Oliver Walters f12f8156bd Fix for "next avilable serial number" string 2020-10-02 13:54:23 +10:00
OliverandGitHub 7f3018ebf8 Merge pull request #1008 from eeintech/parametric_part_tables 
Add parametric part tables to category detail page
 2020-10-02 08:56:05 +10:00
Oliver Walters bbb6319792 Merge remote-tracking branch 'inventree/master' 2020-10-01 14:10:24 +10:00
OliverandGitHub 7356fc3dfc Merge pull request #1002 from eeintech/empty_search_query 
Empty search query returned all elements from database
 2020-10-01 09:34:02 +10:00
OliverandGitHub 4f648f8787 Merge pull request #1010 from SchrodingersGat/admin-permission-fixes 
Update admin links to require specific permissions
 2020-10-01 00:37:43 +10:00
Oliver Walters 756f3ddb0f Hide main elements of navigation bar based on user permissions 2020-10-01 00:25:24 +10:00
Oliver Walters 626d0266c8 Add framework for required permissions for any ajax modal forms 
- Default permissions of "*" will not immediately change any modal forms
- Set the permission_required attribute of any modal form for this to be implemented
 2020-10-01 00:16:04 +10:00
Oliver Walters 56660d52f2 Add "permission denied" message on modal forms 2020-10-01 00:09:21 +10:00
Oliver Walters 81864a6ab8 Fix button layout for stock table 2020-10-01 00:00:37 +10:00
Oliver Walters 27656633df Update admin links to require specific permissions 2020-09-30 23:57:23 +10:00
OliverandGitHub 400f183597 Merge pull request #1009 from SchrodingersGat/ipn-filter 
Add filtering for parts which have an IPN set
 2020-09-30 23:55:27 +10:00
Oliver Walters a952dc38a3 Add filtering for parts which have an IPN set 2020-09-30 23:35:39 +10:00
OliverandGitHub c4cae02170 Update version.py 2020-09-30 08:06:58 +10:00
OliverandGitHub 8ea2c627c4 Update version.py 
Bump version number for release
 2020-09-30 08:06:37 +10:00
OliverandGitHub 064a142d76 Merge pull request #1006 from SchrodingersGat/install_into 
UI stuff
 2020-09-30 08:03:34 +10:00
Oliver Walters 4f1d087654 PEP fix 2020-09-30 07:56:44 +10:00
Oliver Walters d1cce7df94 Add direct admin links if the user is staff 2020-09-30 00:02:10 +10:00
Oliver Walters 0e5f10c020 Add some more search terms to the admin interface 2020-09-29 23:41:50 +10:00
Oliver Walters 1f6cbd7408 Add action to uninstall a particular stock item 2020-09-29 23:11:37 +10:00
Oliver Walters 24b70074e3 Merge remote-tracking branch 'inventree/master' 2020-09-28 22:23:32 +10:00
OliverandGitHub 9e4a599c44 Merge pull request #1001 from SchrodingersGat/index-fix 
Change layout for the index page
 2020-09-28 22:23:08 +10:00
Oliver Walters e78e649aa9 Change layout for the index page 
- Expanding one table doesn't force the neighbouring one to be expanded also
 2020-09-28 22:22:48 +10:00
Oliver Walters 28d9e320fd Merge remote-tracking branch 'inventree/master' 2020-09-28 22:16:32 +10:00
OliverandGitHub 41d6ad2db9 Merge pull request #1000 from SchrodingersGat/installed-in 
Installed in
 2020-09-28 22:16:07 +10:00
Oliver Walters 38beaff01b peppy 2020-09-28 22:09:09 +10:00
Oliver Walters d348d90fbe Cleanup errors in unit testing 2020-09-28 22:08:38 +10:00
Oliver Walters ae55c81dae Updated translation files 2020-09-28 22:04:08 +10:00
Oliver Walters 54bfcff213 CHange "parts" to "items" 2020-09-28 22:03:41 +10:00
Oliver Walters b2b22762ef style fixes 2020-09-28 22:01:45 +10:00
Oliver Walters a18886f196 Add some unit tests for the new functions 2020-09-28 22:00:17 +10:00
Oliver Walters df8d1fb32b Add functions to install and uninstall stock items 2020-09-28 21:52:23 +10:00
Oliver Walters 81ce284264 Select the "default" where we wish to uninstall parts 2020-09-28 21:41:35 +10:00
Oliver Walters 39cfe39172 View / form / url for stock-uninstall form 2020-09-28 21:27:27 +10:00
Oliver Walters ca6994566d Add better terminal support for invoke server command 2020-09-28 21:26:40 +10:00
Oliver Walters 2ef8464a83 Add buttons to remove installed items from a stock item 2020-09-28 20:27:13 +10:00
OliverandGitHub 4de6cc3e4f Merge pull request #999 from SchrodingersGat/build_fix 
Fix unit test
 2020-09-28 20:20:08 +10:00
Oliver Walters b58f7d7461 Custom table display for installed stock items 2020-09-28 20:19:56 +10:00
Oliver Walters d684ed076b Improve table filter naming 2020-09-28 20:10:29 +10:00
Oliver Walters d8a74ad8b7 Style fixes 2020-09-28 20:08:08 +10:00
Oliver Walters f253bf1843 Add ability for stock API to be filtered by installed status 2020-09-28 20:07:25 +10:00
Oliver Walters f409bfd72b More fixes 2020-09-28 19:41:41 +10:00
Oliver Walters 8dd8e69c05 Add "installed parts" tab for stock item 2020-09-28 19:34:43 +10:00
Oliver Walters 97b35d9269 Renamed related name "owned_parts" to "installed_parts" 2020-09-28 19:33:32 +10:00
Oliver Walters 042956ad48 Fix unit test 2020-09-28 19:27:18 +10:00
OliverandGitHub a3f59d8115 Merge pull request #998 from SchrodingersGat/test-report-ordering 
Bugfix: Test result ordering was reversed!
 2020-09-28 09:02:52 +10:00
Oliver Walters b76e6a5023 Bugfix: Test result ordering was reversed! 2020-09-28 09:02:17 +10:00
OliverandGitHub 3a5014da4b Merge pull request #996 from SchrodingersGat/batch-filtering 
Adds ability to filter stock API results by batch code
 2020-09-23 09:20:13 +10:00
Oliver Walters 8a4597be6a Adds ability to filter stock API results by batch code 2020-09-23 09:11:46 +10:00
OliverandGitHub fb247c3dd8 Merge pull request #994 from SchrodingersGat/docs-update 
Update links to documenation
 2020-09-23 08:51:07 +10:00
OliverandGitHub 7dd988a7dc Merge pull request #995 from eeintech/stock_to_build_prefetch 
Reduced SQL load for 'Require Stock to Complete Build' widget on homepage
 2020-09-23 08:45:51 +10:00
Oliver Walters 07adee3c51 Update links to documenation 2020-09-21 22:44:48 +10:00
OliverandGitHub 12e43dcc46 Update README.md 
Rearrange headers in README.md
 2020-09-21 22:40:02 +10:00
OliverandGitHub bc57845aaa Update README.md 
Point to new documentation on readthedocs.io
 2020-09-21 22:39:04 +10:00