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

Merge branch 'test' into 'master' 

Release - fixed __str__, add hint

See merge request !6
parents 4be1ce22 cb2088df
No related branches found
No related tags found
1 merge request!6Release - fixed __str__, add hint
Pipeline #12968 passed
Stage: build
Stage: test_deploy
Show whitespace changes
Inline Side-by-side
Showing
with 109 additions and 51 deletions
README.md
+ 1
− 0
View file @ 9f25c09d
......@@ -36,6 +36,7 @@ V produkci je potřeba:
| proměnná | popis |
| --- | --- |
| `ALLOWED_HOSTS` | Seznam domén, skrz které se na server lze připojovat. [Více info](https://docs.djangoproject.com/en/4.1/ref/settings/#allowed-hosts) |
| `SENTRY_DSN` | Pokud je zadáno, pády se reportují do Sentry. |
## Vývoj
......
contracts/admin.py
+ 10
− 5
View file @ 9f25c09d
......@@ -42,7 +42,7 @@ class IndexHiddenModelAdmin(MarkdownxGuardedModelAdmin):
def permissions_mixin_factory(
change_permission: str,
delete_permission: str,
obj_conditional: typing.Callable = lambda request, obj: True
obj_conditional: typing.Callable = lambda request, obj: True,
) -> object:
class Mixin:
def has_change_permission(self, request, obj=None) -> bool:
......@@ -95,7 +95,8 @@ ParentContractApprovedPermissionsMixin = permissions_mixin_factory(
ParentContractOwnPermissionsMixin = permissions_mixin_factory(
"contracts.edit_others",
"contracts.delete_others",
obj_conditional=lambda request, obj: get_obj_contract(obj).created_by != request.user,
obj_conditional=lambda request, obj: get_obj_contract(obj).created_by
!= request.user,
)
......@@ -500,7 +501,8 @@ class SigneeSignatureRepresentativeAdmin(
permissions_mixin_factory(
"contracts.edit_others",
"contracts.delete_others",
obj_conditional=lambda request, obj: get_obj_contractee_contract(obj).created_by != request.user,
obj_conditional=lambda request, obj: get_obj_contractee_contract(obj).created_by
!= request.user,
),
):
pass
......@@ -511,12 +513,15 @@ class ContracteeSignatureRepresentativeAdmin(
permissions_mixin_factory(
"contracts.edit_when_approved",
"contracts.delete_when_approved",
obj_conditional=lambda request, obj: get_obj_contractee_contract(obj).is_approved,
obj_conditional=lambda request, obj: get_obj_contractee_contract(
obj
).is_approved,
),
permissions_mixin_factory(
"contracts.edit_others",
"contracts.delete_others",
obj_conditional=lambda request, obj: get_obj_contractee_contract(obj).created_by != request.user,
obj_conditional=lambda request, obj: get_obj_contractee_contract(obj).created_by
!= request.user,
),
):
pass
......
contracts/management/commands/import_old_contracts.py
+ 14
− 24
View file @ 9f25c09d
import io
import os
import re
import string
import shutil
import string
from datetime import date, datetime
import yaml
......@@ -588,7 +588,9 @@ class Command(BaseCommand):
issue_count += 1
contract.notes += f"Špatně zadaná funkce zástupce smluvní strany: {signing_party['funkce']}\n"
issues.append(
self.use_issue("Špatně zadaná funkce zástupce smluvní strany")
self.use_issue(
"Špatně zadaná funkce zástupce smluvní strany"
)
)
if self.verbosity >= 2:
......@@ -608,7 +610,9 @@ class Command(BaseCommand):
issue_count += 1
contract.notes += f"Špatně zadaný jeden ze zástupců smluvní strany: {representative_name}\n"
issues.append(
self.use_issue("Špatně zadaný zástupce smluvní strany")
self.use_issue(
"Špatně zadaný zástupce smluvní strany"
)
)
if self.verbosity >= 2:
......@@ -779,9 +783,7 @@ class Command(BaseCommand):
elif value is not None:
observed_issues_count += 1
contract.notes += f"Špatně zadaný začátek platnosti: {value}\n"
issues.append(
self.use_issue("Špatně zadaný začátek platnosti")
)
issues.append(self.use_issue("Špatně zadaný začátek platnosti"))
if self.verbosity >= 2:
self.stderr.write(
......@@ -798,9 +800,7 @@ class Command(BaseCommand):
):
observed_issues_count += 1
contract.notes += f"Špatně zadaný konec platnosti: {value}\n"
issues.append(
self.use_issue("Špatně zadaný konec platnosti")
)
issues.append(self.use_issue("Špatně zadaný konec platnosti"))
if self.verbosity >= 2:
self.stderr.write(
......@@ -914,9 +914,7 @@ class Command(BaseCommand):
contract.notes += (
f"Původní, špatně zadané náklady: {value}\n"
)
issues.append(
self.use_issue("Špatně zadané náklady")
)
issues.append(self.use_issue("Špatně zadané náklady"))
if self.verbosity >= 2:
self.stderr.write(
......@@ -944,9 +942,7 @@ class Command(BaseCommand):
):
observed_issues_count += 1
contract.notes += f"Původní, neropoznané náklady: {value}\n"
issues.append(
self.use_issue("Špatně zadané náklady")
)
issues.append(self.use_issue("Špatně zadané náklady"))
if self.verbosity >= 2:
self.stderr.write(
......@@ -987,9 +983,7 @@ class Command(BaseCommand):
else:
observed_issues_count += 1
contract.notes += f"Špatně zadaná spisovna: {value}\n"
issues.append(
self.use_issue("Špatně zadaná spisovna")
)
issues.append(self.use_issue("Špatně zadaná spisovna"))
if self.verbosity >= 2:
self.stderr.write(
......@@ -1003,9 +997,7 @@ class Command(BaseCommand):
contract.notes += (
f"Špatně zadané smluvní strany, nejsou seznam: {value}\n"
)
issues.append(
self.use_issue("Špatně zadaný smluvní strany")
)
issues.append(self.use_issue("Špatně zadaný smluvní strany"))
if self.verbosity >= 2:
self.stderr.write(
......@@ -1124,9 +1116,7 @@ class Command(BaseCommand):
contract.notes += (
f"Neexistující soubor: {file_value}.\n"
)
issues.append(
self.use_issue("Neexistující soubor")
)
issues.append(self.use_issue("Neexistující soubor"))
if self.verbosity >= 2:
self.stderr.write(
......
contracts/migrations/0059_alter_contract_is_valid.py
+ 8
− 5
View file @ 9f25c09d
......@@ -4,15 +4,18 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('contracts', '0058_alter_contract_options_alter_contractee_options_and_more'),
("contracts", "0058_alter_contract_options_alter_contractee_options_and_more"),
]
operations = [
migrations.AlterField(
model_name='contract',
name='is_valid',
field=models.BooleanField(default=False, help_text='Právní vztah vyplývající ze smlouvy je aktuálně účinný a platný', verbose_name='Je právně platná'),
model_name="contract",
name="is_valid",
field=models.BooleanField(
default=False,
help_text="Právní vztah vyplývající ze smlouvy je aktuálně účinný a platný",
verbose_name="Je právně platná",
),
),
]
contracts/migrations/0060_alter_contractfile_name.py 0 → 100644
+ 20
− 0
View file @ 9f25c09d
# Generated by Django 4.1.4 on 2023-05-03 11:28
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("contracts", "0059_alter_contract_is_valid"),
]
operations = [
migrations.AlterField(
model_name="contractfile",
name="name",
field=models.CharField(
default="Neznámé jméno", max_length=256, verbose_name="Jméno"
),
preserve_default=False,
),
]
contracts/migrations/0061_alter_contract_id_number.py 0 → 100644
+ 23
− 0
View file @ 9f25c09d
# Generated by Django 4.1.4 on 2023-05-23 13:16
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("contracts", "0060_alter_contractfile_name"),
]
operations = [
migrations.AlterField(
model_name="contract",
name="id_number",
field=models.CharField(
blank=True,
help_text="<strong>Není IČO!</strong> Používá se pro identifikaci smluv s velkými organizacemi. Např. <code>MF-8687/2022/15-3</code>.",
max_length=256,
null=True,
verbose_name="Identifikační číslo",
),
),
]
contracts/models.py
+ 7
− 5
View file @ 9f25c09d
......@@ -102,7 +102,7 @@ class RepresentativeMixin:
raise NotImplementedError
def __str__(self) -> str:
result = self.name
result = str(self.name)
if self.function is not None:
result += f", {self.function}"
......@@ -255,7 +255,7 @@ class Signee(
return super().clean()
def __str__(self) -> str:
result = self.name
result = str(self.name)
if self.ico_number is not None:
result += f" ({self.ico_number})"
......@@ -356,7 +356,7 @@ class Contractee(
return reverse("contracts:view_contractee", args=(self.id,))
def __str__(self) -> str:
result = self.name
result = str(self.name)
if self.department is not None:
result += f", {self.department}"
......@@ -511,6 +511,10 @@ class Contract(NameStrMixin, models.Model):
blank=True,
null=True,
verbose_name="Identifikační číslo",
help_text=mark_safe(
"<strong>Není IČO!</strong> Používá se pro identifikaci smluv "
"s velkými organizacemi. Např. <code>MF-8687/2022/15-3</code>."
),
)
types = models.ManyToManyField(
......@@ -856,8 +860,6 @@ class ContractFileField(models.FileField):
class ContractFile(NameStrMixin, models.Model):
name = models.CharField(
max_length=256,
blank=True,
null=True,
verbose_name="Jméno",
)
......
registry/settings/base.py
+ 14
− 0
View file @ 9f25c09d
......@@ -15,6 +15,9 @@ import pathlib
import dj_database_url
import environ
import sentry_sdk
from sentry_sdk.integrations.django import DjangoIntegration
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = pathlib.Path(__file__).parents[2]
......@@ -229,6 +232,17 @@ CLAMD_TCP_SOCKET = env.int("CLAMD_TCP_SOCKET")
CLAMD_TCP_ADDR = env.str("CLAMD_TCP_ADDR")
# Sentry
SENTRY_DSN = env.str("SENTRY_DSN", default="")
if SENTRY_DSN != "":
sentry_sdk.init(
dsn=SENTRY_DSN,
integrations=[DjangoIntegration()],
send_default_pii=True,
)
## App-specific
DEFAULT_CONTRACTEE_NAME = env.str("DEFAULT_CONTRACTEE_NAME")
......
registry/templates/admin/index.html
+ 1
− 1
View file @ 9f25c09d
requirements/production.txt
+ 1
− 0
View file @ 9f25c09d
gunicorn==20.1.0
whitenoise==6.3.0
sentry-sdk==1.24.0
shared/models.py
+ 4
− 2
View file @ 9f25c09d
class NameStrMixin:
name = ""
@property
def name(self):
raise NotImplementedError
def __str__(self) -> str:
return self.name
return str(self.name)
users/models.py
+ 6
− 9
View file @ 9f25c09d
......@@ -90,15 +90,12 @@ class User(pirates_models.AbstractUser):
def get_all_permissions_ordered(self, obj=None) -> list:
if not self.is_superuser:
permissions = (
Permission.
objects.
filter(
models.Q(group__user=self) |
models.Q(user=self)
).
order_by("content_type__app_label").
distinct().
all()
Permission.objects.filter(
models.Q(group__user=self) | models.Q(user=self)
)
.order_by("content_type__app_label")
.distinct()
.all()
)
else:
permissions = Permission.objects.order_by("content_type__app_label").all()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Pirátský GitLab - Home of the CopyLeft