mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

WIP: Vyčištění náhodných věcí (co mě tak kde štvalo) #59

Closed
zelvuska wants to merge 3 commits from vycisteni into master
pull from: vycisteni
merge into: mam:master
Conversation 0 Commits 3 Files changed 31 -21
6 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 811e79d33d - Show all commits

2
personalni/tests.py
View file

@ -6,8 +6,6 @@ from personalni.admin import OsobaAdmin
# Tohle bude peklo, až jednou ty modely fakt rozstřelíme… Možná vyrobit various.all_models, které půjdou importovat jako m? :-) # Tohle bude peklo, až jednou ty modely fakt rozstřelíme… Možná vyrobit various.all_models, které půjdou importovat jako m? :-)
import seminar.models as m import seminar.models as m
import logging
logger = logging.getLogger(__name__)
class DelaniOrguTest(TestCase): class DelaniOrguTest(TestCase):
def setUp(self): def setUp(self):

3
seminar/models/pomocne.py
View file

@ -1,11 +1,8 @@
import logging
import os import os
from django.db import models from django.db import models
from .base import SeminarModelBase from .base import SeminarModelBase
logger = logging.getLogger(__name__)
class Text(SeminarModelBase): class Text(SeminarModelBase):
class Meta: class Meta:

4
seminar/models/treenode.py
View file

@ -1,5 +1,3 @@
import logging
from django.db import models from django.db import models
from django.urls import reverse from django.urls import reverse
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
@ -12,8 +10,6 @@ from personalni.models import Organizator
from .pomocne import Text from .pomocne import Text
logger = logging.getLogger(__name__)
from seminar.models import tvorba as am from seminar.models import tvorba as am
class TreeNode(PolymorphicModel): class TreeNode(PolymorphicModel):

4
seminar/utils.py
View file

@ -12,13 +12,9 @@ from django.contrib.auth.models import AnonymousUser
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
import logging
import seminar.models as m import seminar.models as m
import treenode.treelib as t import treenode.treelib as t
logger = logging.getLogger(__name__)
org_required = permission_required('auth.org') org_required = permission_required('auth.org')
resitel_required = permission_required('auth.resitel') resitel_required = permission_required('auth.resitel')

3
seminar/views/views_all.py
View file

@ -34,7 +34,6 @@ import os
import os.path as op import os.path as op
from django.conf import settings from django.conf import settings
import unicodedata import unicodedata
import logging
import time import time
from collections.abc import Sequence from collections.abc import Sequence
import http import http
@ -51,8 +50,6 @@ from seminar.utils import aktivniResitele
#def temata_v_rocniku(rocnik): #def temata_v_rocniku(rocnik):
# return Problem.objects.filter(typ=Problem.TYP_TEMA, rocnik=rocnik) # return Problem.objects.filter(typ=Problem.TYP_TEMA, rocnik=rocnik)
logger = logging.getLogger(__name__)
def get_problemy_k_tematu(tema): def get_problemy_k_tematu(tema):
return Problem.objects.filter(nadproblem = tema) return Problem.objects.filter(nadproblem = tema)

5
treenode/views.py
View file

@ -13,11 +13,6 @@ import treenode.forms as f
import treenode.templatetags as tnltt import treenode.templatetags as tnltt
import treenode.serializers as vr import treenode.serializers as vr
import logging
logger = logging.getLogger(__name__)
class TNLData(object): class TNLData(object):
def __init__(self,anode,parent=None, index=None): def __init__(self,anode,parent=None, index=None):
self.node = anode self.node = anode