Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Public contract registry
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
TO
Public contract registry
Commits
0ab3c098
Commit
0ab3c098
authored
2 years ago
by
Tomáš Valenta
Browse files
Options
Downloads
Patches
Plain Diff
validate primary contracts being public
parent
9d9397b1
No related branches found
No related tags found
No related merge requests found
Pipeline
#12120
passed
2 years ago
Stage: build
Stage: test_deploy
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
contracts/models.py
+13
-0
13 additions, 0 deletions
contracts/models.py
shared/templatetags/admin_extras.py
+5
-24
5 additions, 24 deletions
shared/templatetags/admin_extras.py
with
18 additions
and
24 deletions
contracts/models.py
+
13
−
0
View file @
0ab3c098
import
typing
import
typing
from
django.conf
import
settings
from
django.conf
import
settings
from
django.core.exceptions
import
ValidationError
from
django.db
import
models
from
django.db
import
models
from
django.db.models.signals
import
post_save
from
django.db.models.signals
import
post_save
from
django.dispatch
import
receiver
from
django.dispatch
import
receiver
...
@@ -561,6 +562,18 @@ class Contract(NameStrMixin, models.Model):
...
@@ -561,6 +562,18 @@ class Contract(NameStrMixin, models.Model):
self
.
save
()
self
.
save
()
def
clean
(
self
):
if
(
self
.
primary_contract
is
not
None
and
self
.
is_public
and
not
self
.
primary_contract
.
is_public
):
raise
ValidationError
(
{
"
is_public
"
:
"
Primární smlouva je neveřejná, tato smlouva nemůže být veřejná.
"
}
)
class
Meta
:
class
Meta
:
app_label
=
"
contracts
"
app_label
=
"
contracts
"
...
...
This diff is collapsed.
Click to expand it.
shared/templatetags/admin_extras.py
+
5
−
24
View file @
0ab3c098
...
@@ -2,7 +2,6 @@ from django.template import Library
...
@@ -2,7 +2,6 @@ from django.template import Library
from
shared.admin
import
FieldsetInlineOrder
from
shared.admin
import
FieldsetInlineOrder
register
=
Library
()
register
=
Library
()
...
@@ -27,33 +26,15 @@ def get_fieldsets_and_inlines(context):
...
@@ -27,33 +26,15 @@ def get_fieldsets_and_inlines(context):
):
):
if
choice
==
FieldsetInlineOrder
.
FIELDSET
:
if
choice
==
FieldsetInlineOrder
.
FIELDSET
:
fieldsets_and_inlines
.
append
(
fieldsets_and_inlines
.
append
(
(
(
FieldsetInlineOrder
.
FIELDSET
,
next
(
adminform
))
FieldsetInlineOrder
.
FIELDSET
,
next
(
adminform
)
)
)
)
elif
choice
==
FieldsetInlineOrder
.
INLINE
:
elif
choice
==
FieldsetInlineOrder
.
INLINE
:
fieldsets_and_inlines
.
append
(
fieldsets_and_inlines
.
append
((
FieldsetInlineOrder
.
INLINE
,
next
(
inlines
)))
(
FieldsetInlineOrder
.
INLINE
,
next
(
inlines
)
)
)
for
fieldset
in
adminform
:
for
fieldset
in
adminform
:
fieldsets_and_inlines
.
append
(
fieldsets_and_inlines
.
append
((
FieldsetInlineOrder
.
FIELDSET
,
fieldset
))
(
FieldsetInlineOrder
.
FIELDSET
,
fieldset
)
)
for
inline
in
inlines
:
for
inline
in
inlines
:
fieldsets_and_inlines
.
append
(
fieldsets_and_inlines
.
append
((
FieldsetInlineOrder
.
INLINE
,
inline
))
(
FieldsetInlineOrder
.
INLINE
,
inline
)
)
return
fieldsets_and_inlines
return
fieldsets_and_inlines
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