Standards aenderungen raus

This commit is contained in:
holger.trampe 2020-03-06 22:47:12 +01:00
parent b74e0e5fb0
commit ac10ba08c2
1 changed files with 18 additions and 16 deletions

View File

@ -22,11 +22,12 @@ class StandardAddStandard(forms.ModelForm):
"task" : "Tätigkeitsbereich", "task" : "Tätigkeitsbereich",
"content": "Inhalt", "content": "Inhalt",
"public" : "Direkt veröffentlichen?", "public" : "Direkt veröffentlichen?",
"representative" : "Vertreter", #"representative" : "Vertreter",
"executor" : "Ausführender", #"executor" : "Ausführender",
"authority" : "Verantwortlicher", #"authority" : "Verantwortlicher",
} }
fields = ['name', 'area', 'task', 'content', 'public', "authority", "executor", "representative"] #fields = ['name', 'area', 'task', 'content', 'public', "authority", "executor", "representative"]
fields = ['name', 'area', 'task', 'content', 'public']
''' '''
Hier werden die Elemente für die DropDowns erstellt, damit Hier werden die Elemente für die DropDowns erstellt, damit
@ -50,13 +51,13 @@ class StandardAddStandard(forms.ModelForm):
elif self.instance.pk: elif self.instance.pk:
self.fields['task'].queryset = Tasks.objects.none() self.fields['task'].queryset = Tasks.objects.none()
self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk) #self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk)
self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk) #self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk)
self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk) #self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk)
self.fields['checked_groups'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) #self.fields['checked_groups'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput())
self.fields['added_files'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) #self.fields['added_files'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput())
self.fields['added_standards'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) #self.fields['added_standards'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput())
class StandardAddStandardEditor(forms.ModelForm): class StandardAddStandardEditor(forms.ModelForm):
@ -83,11 +84,12 @@ class StandardUpdateStandard(forms.ModelForm):
"area" : "Übergeordneter Bereich", "area" : "Übergeordneter Bereich",
"task" : "Tätigkeitsbereich", "task" : "Tätigkeitsbereich",
"content": "Inhalt", "content": "Inhalt",
"representative" : "Vertreter", #"representative" : "Vertreter",
"executor" : "Ausführender", #"executor" : "Ausführender",
"authority" : "Verantwortlicher", #"authority" : "Verantwortlicher",
} }
fields = ['name', 'area', 'task', 'content', "authority", "executor", "representative"] fields = ['name', 'area', 'task', 'content', "authority", "executor", "representative"]
fields = ['name', 'area', 'task', 'content']
''' '''
Hier werden die Elemente für die DropDowns erstellt, damit Hier werden die Elemente für die DropDowns erstellt, damit
@ -114,9 +116,9 @@ class StandardUpdateStandard(forms.ModelForm):
elif loggeduser.pk: elif loggeduser.pk:
self.fields['task'].queryset = Tasks.objects.filter(area__pk=standard.area.pk) self.fields['task'].queryset = Tasks.objects.filter(area__pk=standard.area.pk)
self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk) #self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk)
self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk) #self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk)
self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk) #self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk)
class StandardUpdateStandardEditor(forms.ModelForm): class StandardUpdateStandardEditor(forms.ModelForm):