Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SMASCH
scheduling-system
Commits
3d5ebb3e
Commit
3d5ebb3e
authored
3 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
indentation, unused code removed
parent
9e1d0d8b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!336
Pylint checks
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
smash/web/forms/appointment_form.py
+7
-7
7 additions, 7 deletions
smash/web/forms/appointment_form.py
smash/web/forms/mail_template.py
+2
-4
2 additions, 4 deletions
smash/web/forms/mail_template.py
with
9 additions
and
11 deletions
smash/web/forms/appointment_form.py
+
7
−
7
View file @
3d5ebb3e
...
@@ -34,13 +34,13 @@ class AppointmentForm(ModelForm):
...
@@ -34,13 +34,13 @@ class AppointmentForm(ModelForm):
for
field
in
self
.
changed_data
:
for
field
in
self
.
changed_data
:
new_value
=
self
.
cleaned_data
[
field
]
or
self
.
data
[
field
]
new_value
=
self
.
cleaned_data
[
field
]
or
self
.
data
[
field
]
if
isinstance
(
new_value
,
QuerySet
):
if
isinstance
(
new_value
,
QuerySet
):
new_human_values
=
'
;
'
.
join
([
str
(
element
)
for
element
in
new_value
])
new_human_values
=
'
;
'
.
join
([
str
(
element
)
for
element
in
new_value
])
new_value
=
'
,
'
.
join
([
str
(
element
.
id
)
for
element
in
new_value
])
#overwrite variable
new_value
=
'
,
'
.
join
([
str
(
element
.
id
)
for
element
in
new_value
])
#overwrite variable
#old value
#old value
if
self
.
instance
.
id
:
#update instance
if
self
.
instance
.
id
:
#update instance
list_of_values
=
getattr
(
self
.
instance
,
field
).
all
()
list_of_values
=
getattr
(
self
.
instance
,
field
).
all
()
old_human_values
=
'
;
'
.
join
([
str
(
element
)
for
element
in
list_of_values
])
old_human_values
=
'
;
'
.
join
([
str
(
element
)
for
element
in
list_of_values
])
previous_value
=
'
,
'
.
join
([
str
(
element
.
id
)
for
element
in
list_of_values
])
previous_value
=
'
,
'
.
join
([
str
(
element
.
id
)
for
element
in
list_of_values
])
else
:
#new instance
else
:
#new instance
old_human_values
=
''
old_human_values
=
''
previous_value
=
''
previous_value
=
''
...
@@ -91,8 +91,8 @@ class AppointmentEditForm(AppointmentForm):
...
@@ -91,8 +91,8 @@ class AppointmentEditForm(AppointmentForm):
else
:
else
:
initial_appointment_types
=
[]
initial_appointment_types
=
[]
fields
=
OrderedDict
()
fields
=
OrderedDict
()
for
i
,
tuple
in
enumerate
(
self
.
fields
.
items
()):
for
i
,
field_
tuple
in
enumerate
(
self
.
fields
.
items
()):
key
,
value
=
tuple
key
,
value
=
field_
tuple
fields
[
key
]
=
value
fields
[
key
]
=
value
if
i
==
APPOINTMENT_TYPES_FIELD_POSITION
:
if
i
==
APPOINTMENT_TYPES_FIELD_POSITION
:
fields
[
'
appointment_types
'
]
=
forms
.
ModelMultipleChoiceField
(
required
=
False
,
fields
[
'
appointment_types
'
]
=
forms
.
ModelMultipleChoiceField
(
required
=
False
,
...
@@ -157,8 +157,8 @@ class AppointmentAddForm(AppointmentForm):
...
@@ -157,8 +157,8 @@ class AppointmentAddForm(AppointmentForm):
super
(
AppointmentAddForm
,
self
).
__init__
(
*
args
,
**
kwargs
)
super
(
AppointmentAddForm
,
self
).
__init__
(
*
args
,
**
kwargs
)
fields
=
OrderedDict
()
fields
=
OrderedDict
()
for
i
,
tuple
in
enumerate
(
self
.
fields
.
items
()):
for
i
,
field_
tuple
in
enumerate
(
self
.
fields
.
items
()):
key
,
value
=
tuple
key
,
value
=
field_
tuple
fields
[
key
]
=
value
fields
[
key
]
=
value
if
i
==
APPOINTMENT_TYPES_FIELD_POSITION
:
if
i
==
APPOINTMENT_TYPES_FIELD_POSITION
:
fields
[
'
appointment_types
'
]
=
forms
.
ModelMultipleChoiceField
(
required
=
False
,
fields
[
'
appointment_types
'
]
=
forms
.
ModelMultipleChoiceField
(
required
=
False
,
...
...
This diff is collapsed.
Click to expand it.
smash/web/forms/mail_template.py
+
2
−
4
View file @
3d5ebb3e
...
@@ -13,12 +13,10 @@ class MailTemplateForm(ModelForm):
...
@@ -13,12 +13,10 @@ class MailTemplateForm(ModelForm):
def
__init__
(
self
,
*
args
,
**
kwargs
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
super
(
MailTemplateForm
,
self
).
__init__
(
*
args
,
**
kwargs
)
super
(
MailTemplateForm
,
self
).
__init__
(
*
args
,
**
kwargs
)
instance
=
getattr
(
self
,
'
instance
'
,
None
)
self
.
fields
[
'
Multilingual
'
]
=
forms
.
BooleanField
(
label
=
'
Multilingual
'
,
disabled
=
True
,
required
=
False
,
self
.
fields
[
'
Multilingual
'
]
=
forms
.
BooleanField
(
label
=
'
Multilingual
'
,
disabled
=
True
,
required
=
False
,
help_text
=
'
Only for voucher context. Check this option if the voucher template is multilingual.
'
,
help_text
=
'
Only for voucher context. Check this option if the voucher template is multilingual.
'
,
widget
=
forms
.
CheckboxInput
(
attrs
=
{
'
class
'
:
'
hidden_form_field
'
,
'
id
'
:
'
multilingual_checkbox
'
}))
widget
=
forms
.
CheckboxInput
(
attrs
=
{
'
class
'
:
'
hidden_form_field
'
,
'
id
'
:
'
multilingual_checkbox
'
}))
def
clean
(
self
):
def
clean
(
self
):
cleaned_data
=
super
(
MailTemplateForm
,
self
).
clean
()
cleaned_data
=
super
(
MailTemplateForm
,
self
).
clean
()
return
cleaned_data
return
cleaned_data
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment