Skip to content
Snippets Groups Projects
Commit be93a497 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

run hooks

parent a49accf2
No related branches found
No related tags found
No related merge requests found
Pipeline #12414 passed
...@@ -10,16 +10,21 @@ from rangefilter.filters import DateRangeFilter ...@@ -10,16 +10,21 @@ from rangefilter.filters import DateRangeFilter
from shared.admin import FieldsetInlineOrder, MarkdownxGuardedModelAdmin from shared.admin import FieldsetInlineOrder, MarkdownxGuardedModelAdmin
from .forms import ContractAdminForm, ContractFileAdminForm, SigneeAdminForm, AtLeastOneRequiredInlineFormSet from .forms import (
AtLeastOneRequiredInlineFormSet,
ContractAdminForm,
ContractFileAdminForm,
SigneeAdminForm,
)
from .models import ( from .models import (
Contract, Contract,
ContractApproval,
Contractee, Contractee,
ContracteeSignature, ContracteeSignature,
ContracteeSignatureRepresentative, ContracteeSignatureRepresentative,
ContractFile, ContractFile,
ContractFilingArea, ContractFilingArea,
ContractIntent, ContractIntent,
ContractApproval,
ContractIssue, ContractIssue,
ContractType, ContractType,
Signee, Signee,
......
...@@ -16,7 +16,7 @@ class AtLeastOneRequiredInlineFormSet(BaseInlineFormSet): ...@@ -16,7 +16,7 @@ class AtLeastOneRequiredInlineFormSet(BaseInlineFormSet):
return return
if not any( if not any(
cleaned_data and not cleaned_data.get('DELETE', False) cleaned_data and not cleaned_data.get("DELETE", False)
for cleaned_data in self.cleaned_data for cleaned_data in self.cleaned_data
): ):
raise forms.ValidationError("Vyžadován aspoň jeden záznam.") raise forms.ValidationError("Vyžadován aspoň jeden záznam.")
......
...@@ -4,16 +4,17 @@ from django.db import migrations, models ...@@ -4,16 +4,17 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('contracts', '0044_alter_contract_tender_url'), ("contracts", "0044_alter_contract_tender_url"),
] ]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name='contracteesignaturerepresentative', model_name="contracteesignaturerepresentative",
name='function', name="function",
field=models.CharField(default='k vyplnění', max_length=256, verbose_name='Funkce'), field=models.CharField(
default="k vyplnění", max_length=256, verbose_name="Funkce"
),
preserve_default=False, preserve_default=False,
), ),
] ]
...@@ -4,15 +4,26 @@ from django.db import migrations, models ...@@ -4,15 +4,26 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('contracts', '0045_alter_contracteesignaturerepresentative_function'), ("contracts", "0045_alter_contracteesignaturerepresentative_function"),
] ]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name='contract', model_name="contract",
name='paper_form_state', name="paper_form_state",
field=models.CharField(choices=[('on_the_way', 'Na cestě'), ('sent', 'Odeslaný'), ('mailbox', 'Ve schránce'), ('to_shred', 'Ke skartaci'), ('shredded', 'Skartovaný'), ('stored', 'Uložený'), ('lost', 'Ztracený')], max_length=10, verbose_name='Stav fyzického dokumentu'), field=models.CharField(
choices=[
("on_the_way", "Na cestě"),
("sent", "Odeslaný"),
("mailbox", "Ve schránce"),
("to_shred", "Ke skartaci"),
("shredded", "Skartovaný"),
("stored", "Uložený"),
("lost", "Ztracený"),
],
max_length=10,
verbose_name="Stav fyzického dokumentu",
),
), ),
] ]
# Generated by Django 4.1.4 on 2023-04-16 13:13 # Generated by Django 4.1.4 on 2023-04-16 13:13
import contracts.models
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models
import contracts.models
import shared.models import shared.models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('contracts', '0046_alter_contract_paper_form_state'), ("contracts", "0046_alter_contract_paper_form_state"),
] ]
operations = [ operations = [
migrations.RemoveField( migrations.RemoveField(
model_name='contract', model_name="contract",
name='agreement_url', name="agreement_url",
), ),
migrations.CreateModel( migrations.CreateModel(
name='ContractApproval', name="ContractApproval",
fields=[ fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), (
('name', models.CharField(max_length=128, verbose_name='Jméno')), "id",
('url', contracts.models.SubdomainValidatedURLField(help_text='Běžně odkaz na fórum. Využívá se např. u koaličních smluv. Musí začínat <i>https</i> a být pod doménou <i>pirati.cz</i>.', max_length=256, verbose_name='Odkaz')), models.BigAutoField(
('contract', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='approvals', to='contracts.contract', verbose_name='Smlouva')), auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=128, verbose_name="Jméno")),
(
"url",
contracts.models.SubdomainValidatedURLField(
help_text="Běžně odkaz na fórum. Využívá se např. u koaličních smluv. Musí začínat <i>https</i> a být pod doménou <i>pirati.cz</i>.",
max_length=256,
verbose_name="Odkaz",
),
),
(
"contract",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="approvals",
to="contracts.contract",
verbose_name="Smlouva",
),
),
], ],
options={ options={
'verbose_name': 'Schválení', "verbose_name": "Schválení",
'verbose_name_plural': 'Schválení', "verbose_name_plural": "Schválení",
}, },
bases=(shared.models.NameStrMixin, models.Model), bases=(shared.models.NameStrMixin, models.Model),
), ),
......
# Generated by Django 4.1.4 on 2023-04-16 13:17 # Generated by Django 4.1.4 on 2023-04-16 13:17
import contracts.models
from django.db import migrations from django.db import migrations
import contracts.models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('contracts', '0047_remove_contract_agreement_url_contractapproval'), ("contracts", "0047_remove_contract_agreement_url_contractapproval"),
] ]
operations = [ operations = [
migrations.AlterModelOptions( migrations.AlterModelOptions(
name='contractapproval', name="contractapproval",
options={'verbose_name': 'Odkaz na schválení na Fóru', 'verbose_name_plural': 'Odkazy na schválení na Fóru'}, options={
"verbose_name": "Odkaz na schválení na Fóru",
"verbose_name_plural": "Odkazy na schválení na Fóru",
},
), ),
migrations.AlterModelOptions( migrations.AlterModelOptions(
name='contractintent', name="contractintent",
options={'verbose_name': 'Odkaz na záměr v Piroplácení', 'verbose_name_plural': 'Odkazy na záměry v Piroplácení'}, options={
"verbose_name": "Odkaz na záměr v Piroplácení",
"verbose_name_plural": "Odkazy na záměry v Piroplácení",
},
), ),
migrations.AlterField( migrations.AlterField(
model_name='contractapproval', model_name="contractapproval",
name='url', name="url",
field=contracts.models.SubdomainValidatedURLField(help_text='Využívá se např. u koaličních smluv. Musí začínat <i>https</i> a být pod doménou <i>pirati.cz</i>.', max_length=256, verbose_name='Odkaz'), field=contracts.models.SubdomainValidatedURLField(
help_text="Využívá se např. u koaličních smluv. Musí začínat <i>https</i> a být pod doménou <i>pirati.cz</i>.",
max_length=256,
verbose_name="Odkaz",
),
), ),
] ]
...@@ -4,14 +4,25 @@ from django.db import migrations ...@@ -4,14 +4,25 @@ from django.db import migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('contracts', '0048_alter_contractapproval_options_and_more'), ("contracts", "0048_alter_contractapproval_options_and_more"),
] ]
operations = [ operations = [
migrations.AlterModelOptions( migrations.AlterModelOptions(
name='contract', name="contract",
options={'permissions': [('approve', 'Schválit / zrušit schválení'), ('view_confidential', 'Zobrazit tajné informace'), ('edit_when_approved', 'Upravit schválené'), ('delete_when_approved', 'Odstranit schválené'), ('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí'), ('can_edit_contract_settings', 'Can edit Smlouva settings')], 'verbose_name': 'Smlouva', 'verbose_name_plural': 'Smlouvy'}, options={
"permissions": [
("approve", "Schválit / zrušit schválení"),
("view_confidential", "Zobrazit tajné informace"),
("edit_when_approved", "Upravit schválené"),
("delete_when_approved", "Odstranit schválené"),
("edit_others", "Upravit cizí"),
("delete_others", "Odstranit cizí"),
("can_edit_contract_settings", "Can edit Smlouva settings"),
],
"verbose_name": "Smlouva",
"verbose_name_plural": "Smlouvy",
},
), ),
] ]
import dbsettings import dbsettings
from django import forms from django import forms
......
...@@ -67,12 +67,7 @@ def get_paginated_contracts(request, filter=None, annotations=None) -> tuple: ...@@ -67,12 +67,7 @@ def get_paginated_contracts(request, filter=None, annotations=None) -> tuple:
if annotations is not None: if annotations is not None:
contracts = contracts.annotate(**annotations) contracts = contracts.annotate(**annotations)
contracts = ( contracts = contracts.filter(filter).order_by("-valid_start_date").all()
contracts
.filter(filter)
.order_by("-valid_start_date")
.all()
)
page, paginator = get_pagination(request, contracts) page, paginator = get_pagination(request, contracts)
...@@ -149,7 +144,7 @@ def search(request): ...@@ -149,7 +144,7 @@ def search(request):
{ {
"lower_name": Lower("name"), "lower_name": Lower("name"),
"lower_summary": Lower("summary"), "lower_summary": Lower("summary"),
} },
) )
return render( return render(
...@@ -163,7 +158,7 @@ def search(request): ...@@ -163,7 +158,7 @@ def search(request):
"paginator": paginator, "paginator": paginator,
"query": query, "query": query,
"query_is_set": query_is_set, "query_is_set": query_is_set,
} },
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment