inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-01 03:00:54 +00:00
Code Activity

Switched to global owner model, need to validate use-cases table and fix tests

Browse Source
This commit is contained in:
eeintech
2021-01-11 17:41:29 -05:00
parent 6a88bdb37d
commit 6f3cbb4e14
7 changed files with 180 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
InvenTree/stock/forms.py
View File

@ -10,7 +10,6 @@ from django.forms.utils import ErrorDict
from django.utils.translation import ugettext as _
from django.core.validators import MinValueValidator
from django.core.exceptions import ValidationError
from django.contrib.auth.models import User, Group
from mptt.fields import TreeNodeChoiceField
@ -86,37 +85,15 @@ class EditStockItemTestResultForm(HelperForm):
class EditStockLocationForm(HelperForm):
""" Form for editing a StockLocation """
owner = forms.ChoiceField(
label=_('Owner'),
help_text=_('Select Owner')
)
class Meta:
model = StockLocation
fields = [
'name',
'parent',
'description',
'owner',
]
def get_owner_choices(self):
choices = [('', '-' * 10)]
for group in Group.objects.all():
choices.append((f'group_{group.name}', f'{group} (Group)'))
for user in User.objects.all():
choices.append((f'user_{user.username}', f'{user} (User)'))
return choices
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['owner'].choices = self.get_owner_choices()
class ConvertStockItemForm(HelperForm):
"""

25
InvenTree/stock/migrations/0057_stock_location_item_owner.py Normal file
View File

@ -0,0 +1,25 @@
# Generated by Django 3.0.7 on 2021-01-11 21:54
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('users', '0004_owner_model'),
('stock', '0056_stockitem_expiry_date'),
]
operations = [
migrations.AddField(
model_name='stockitem',
name='owner',
field=models.ForeignKey(blank=True, help_text='Select Owner', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='stock_items', to='users.Owner'),
),
migrations.AddField(
model_name='stocklocation',
name='owner',
field=models.ForeignKey(blank=True, help_text='Select Owner', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='stock_locations', to='users.Owner'),
),
]

37
InvenTree/stock/models.py
View File

@ -16,11 +16,9 @@ from django.db import models, transaction
from django.db.models import Sum, Q
from django.db.models.functions import Coalesce
from django.core.validators import MinValueValidator
from django.contrib.auth.models import User, Group
from django.contrib.auth.models import User
from django.db.models.signals import pre_delete
from django.dispatch import receiver
from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.contenttypes.models import ContentType
from markdownx.models import MarkdownxField
@ -39,6 +37,8 @@ from InvenTree.status_codes import StockStatus
from InvenTree.models import InvenTreeTree, InvenTreeAttachment
from InvenTree.fields import InvenTreeURLField
from users.models import Owner
from company import models as CompanyModels
from part import models as PartModels
@ -49,28 +49,9 @@ class StockLocation(InvenTreeTree):
Stock locations can be heirarchical as required
"""
owner_type = models.ForeignKey(ContentType, on_delete=models.CASCADE, null=True, blank=True)
owner_id = models.PositiveIntegerField(null=True, blank=True)
owner = GenericForeignKey('owner_type', 'owner_id')
def save(self, *args, **kwargs):
""" Custom save method to process StockLocation owner """
# Extract owner
try:
owner = kwargs.pop('owner')
except KeyError:
owner = ''
# Set the owner
if owner.startswith('group'):
group_name = owner.replace('group_', '')
self.owner = Group.objects.get(name=group_name)
elif owner.startswith('user'):
user_name = owner.replace('user_', '')
self.owner = User.objects.get(username=user_name)
super(StockLocation, self).save(*args, **kwargs)
owner = models.ForeignKey(Owner, on_delete=models.CASCADE, blank=True, null=True,
help_text='Select Owner',
related_name='stock_locations')
def get_absolute_url(self):
return reverse('stock-location-detail', kwargs={'pk': self.id})
@ -499,9 +480,9 @@ class StockItem(MPTTModel):
help_text=_('Single unit purchase price at time of purchase'),
)
owner = models.ForeignKey(User, on_delete=models.SET_NULL, blank=True, null=True,
help_text='Owner (User)',
related_name='owner_stockitems')
owner = models.ForeignKey(Owner, on_delete=models.SET_NULL, blank=True, null=True,
help_text='Select Owner',
related_name='stock_items')
def is_stale(self):
"""

68
InvenTree/stock/views.py
View File

@ -11,7 +11,7 @@ from django.views.generic import DetailView, ListView, UpdateView
from django.forms.models import model_to_dict
from django.forms import HiddenInput
from django.urls import reverse
from django.contrib.auth.models import User, Group
from django.contrib.auth.models import Group, User
from django.utils.translation import ugettext as _
@ -125,24 +125,6 @@ class StockLocationEdit(AjaxUpdateView):
ajax_form_title = _('Edit Stock Location')
role_required = 'stock.change'
def get_owner_initial(self):
initial = ''
location = self.get_object()
owner = location.owner
if owner:
if type(owner) is Group:
group_name = owner.name
initial = f'group_{group_name}'
elif type(owner) is User:
user_name = owner.username
initial = f'user_{user_name}'
return initial
def get_form(self):
""" Customize form data for StockLocation editing.
@ -162,12 +144,12 @@ class StockLocationEdit(AjaxUpdateView):
# Is ownership control enabled?
stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
owner_initial = self.get_owner_initial()
owner = location.owner
if not stock_ownership_control:
form.fields['owner'].widget = HiddenInput()
else:
form.fields['owner'].initial = owner_initial
form.fields['owner'].initial = owner
if location.parent:
form.fields['owner'].initial = location.parent.owner
if not self.request.user.is_superuser:
@ -180,21 +162,14 @@ class StockLocationEdit(AjaxUpdateView):
- update all children's owners with location's owner
"""
self.object = form.save(commit=False)
# parent = form.cleaned_data.get('parent', None)
self.object = form.save()
stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
if stock_ownership_control:
owner = form.cleaned_data.get('owner', None)
self.object.save(**{'owner': owner})
if self.object.get_children():
for child in self.object.get_children():
child.owner = self.object.owner
child.save()
else:
self.object.save()
return self.object
@ -1386,10 +1361,18 @@ class StockItemEdit(AjaxUpdateView):
if not stock_ownership_control:
form.fields['owner'].widget = HiddenInput()
else:
if location:
# Check if location has owner
if location.owner:
form.fields['owner'].queryset = User.objects.filter(groups=location.owner)
location_owner = location.owner
# Check if location has owner
if location_owner:
# Check location owner type and filter
if type(location_owner.owner) is Group:
queryset = location_owner.get_users()
if self.request.user in queryset:
form.fields['owner'].initial = self.request.user
form.fields['owner'].queryset = queryset
elif type(location_owner.owner) is User:
form.fields['owner'].disabled = True
form.fields['owner'].initial = location_owner
return form
@ -1492,13 +1475,12 @@ class StockLocationCreate(AjaxCreateView):
self.object = form.save(commit=False)
parent = form.cleaned_data.get('parent', None)
owner = form.cleaned_data.get('owner', None)
if parent:
# Select parent's owner
self.object.owner = parent.owner
self.object.save()
else:
self.object.save(**{'owner': owner})
self.object.save()
return self.object
@ -1734,13 +1716,17 @@ class StockItemCreate(AjaxCreateView):
if not stock_ownership_control:
form.fields['owner'].widget = HiddenInput()
else:
if location:
# Check if location has owner
if location.owner:
queryset = User.objects.filter(groups=location.owner)
location_owner = location.owner
if location_owner:
# Check location owner type and filter
if type(location_owner.owner) is Group:
queryset = location_owner.get_users()
if self.request.user in queryset:
form.fields['owner'].initial = self.request.user
form.fields['owner'].queryset = queryset
elif type(location_owner.owner) is User:
form.fields['owner'].disabled = True
form.fields['owner'].initial = location_owner
return form