From 7c1838bb204406eefc5eb43c08e550251c0216c5 Mon Sep 17 00:00:00 2001 From: "Tomas \"Jethro\" Pokorny" Date: Fri, 14 Sep 2018 16:59:02 +0200 Subject: [PATCH 01/12] Opraveny debugovaci veci pro local a test. --- mamweb/settings_local.py | 9 ++++----- mamweb/settings_test.py | 5 ++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mamweb/settings_local.py b/mamweb/settings_local.py index 68030cdd..501326dd 100644 --- a/mamweb/settings_local.py +++ b/mamweb/settings_local.py @@ -10,6 +10,9 @@ import os.path # Import common settings from .settings_common import * +MIDDLEWARE_CLASSES += ( + 'debug_toolbar.middleware.DebugToolbarMiddleware', + ) # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ @@ -22,7 +25,7 @@ INSTALLED_APPS += ( # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -TEMPLATE_DEBUG = True +TEMPLATES[0]['OPTIONS']['debug'] = True ALLOWED_HOSTS = ['127.0.0.1'] @@ -48,7 +51,3 @@ DATABASES = { # set to 'DEBUG' for EXTRA verbose output LOGGING['handlers']['console']['level'] = 'INFO' -# So that it is not necessary to restart the server every time a template is -# changed -TEMPLATE_LOADERS = ('django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader') diff --git a/mamweb/settings_test.py b/mamweb/settings_test.py index 877b9ac0..0cc44a64 100644 --- a/mamweb/settings_test.py +++ b/mamweb/settings_test.py @@ -12,6 +12,9 @@ import os.path # Import common settings from .settings_common import * # zatim nutne, casem snad vyresime # noqa +MIDDLEWARE_CLASSES += ( + 'debug_toolbar.middleware.DebugToolbarMiddleware', + ) # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ @@ -27,7 +30,7 @@ SECRET_KEY = ')^u=i65*zmr_k53a*@f4q_+ji^o@!pgpef*5&8c7zzv9l+zo)n' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -TEMPLATE_DEBUG = False +TEMPLATES[0]['OPTIONS']['debug'] = True ALLOWED_HOSTS = ['*.mam.mff.cuni.cz', 'atrey.karlin.mff.cuni.cz', 'mam.mff.cuni.cz', 'mam-test.kam.mff.cuni.cz', 'gimli.ms.mff.cuni.cz'] From f49524070189d7b46c4ca257e63301d2b3af6655 Mon Sep 17 00:00:00 2001 From: "Tomas \"Jethro\" Pokorny" Date: Fri, 14 Sep 2018 17:53:26 +0200 Subject: [PATCH 02/12] Fixed sync_local_db and sync_local_media. --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 789e5a0c..51bbdfad 100644 --- a/Makefile +++ b/Makefile @@ -119,12 +119,13 @@ sync_test: sync_test_media sync_test_db # Does not sync Galerie and CACHE (too huge). sync_local_media: rsync -ave ssh --exclude Galerie --exclude CACHE\ - www-mam@atrey.karlin.mff.cuni.cz:/akce/MaM/WWW/mamweb-prod/media/ ./media/ + mam-web@gimli.ms.mff.cuni.cz:/akce/mam/www/mamweb-prod/media/ ./media/ # Downloads and restores production database to local database. PostgreSQL only. sync_local_db: - scp www-mam@atrey.karlin.mff.cuni.cz:`ssh www-mam@atrey.karlin.mff.cuni.cz 'ls -v /akce/MaM/WWW/backups/mam-prod-*\.pgdump | tail -n 1'` \ - ./last.pgdump - pg_restore -c -d mam_prod last.pgdump + scp mam-web@gimli.ms.mff.cuni.cz:`ssh mam-web@gimli.ms.mff.cuni.cz 'ls -v /akce/mam/www/backups/mam_prod-*\.pgdump.xz | tail -n 1'` \ + ./last.pgdump.xz + xz -fd last.pgdump.xz + pg_restore -c -d mam-prod last.pgdump # Sync database and media. See above lines sync_local: sync_media sync_db From 8ab43b9ae18b73bf50e41a9654812eaee74bea5c Mon Sep 17 00:00:00 2001 From: "Tomas \"Jethro\" Pokorny" Date: Fri, 14 Sep 2018 17:54:47 +0200 Subject: [PATCH 03/12] Fixed query. --- seminar/views.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/seminar/views.py b/seminar/views.py index 7a5e9f41..3e3754f2 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -552,9 +552,8 @@ def aktivniResitele(rocnik,cislo): if int(cislo) > 3: problemy = Problem.objects.filter(cislo_zadani = letos.cisla) else: - problemy = Problem.objects.filter(Q(cislo_zadani = letos.cisla)|Q(cislo_zadani=loni.cisla)) - resitele = aktualni_resitele.filter(reseni = Reseni.objects.filter(problem=problemy)).distinct() - + problemy = Problem.objects.filter(Q(cislo_zadani__in = letos.cisla)|Q(cislo_zadani__in = loni.cisla)) + resitele = aktualni_resitele.filter(reseni__in = Reseni.objects.filter(problem__in=problemy)).distinct() return resitele From 36dbab7b38844edfe9a033f56a161f4f4853e805 Mon Sep 17 00:00:00 2001 From: "Tomas \"Jethro\" Pokorny" Date: Fri, 14 Sep 2018 18:11:12 +0200 Subject: [PATCH 04/12] Na gimlim je UTF-8 TeX --- seminar/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/seminar/views.py b/seminar/views.py index 3e3754f2..a42e697d 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -566,8 +566,7 @@ def obalkyView(request,resitele): tempdir = tempfile.mkdtemp() with open(tempdir+"/obalky.tex","w") as texfile: - # Pokud TeX chce ISO Latin, tak se da encode nastavit - texfile.write(tex.decode("utf-8").encode("iso-8859-2")) + texfile.write(tex) shutil.copy(os.path.join(settings.STATIC_ROOT, 'seminar/lisak.eps'),tempdir) subprocess.call(["csplain","obalky.tex"],cwd = tempdir) subprocess.call(["dvipdf","obalky.dvi"],cwd = tempdir) From 16a070a79a94b91f96aea36cca37c836634e1c8e Mon Sep 17 00:00:00 2001 From: LEdoian Date: Fri, 14 Sep 2018 18:52:47 +0200 Subject: [PATCH 05/12] =?UTF-8?q?Ob=C3=A1lky:=20LaTeXov=C3=BD=20template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/archiv/obalky.tex | 141 +++++++++++--------- seminar/views.py | 3 +- 2 files changed, 79 insertions(+), 65 deletions(-) diff --git a/seminar/templates/seminar/archiv/obalky.tex b/seminar/templates/seminar/archiv/obalky.tex index 72c4ab04..07574560 100644 --- a/seminar/templates/seminar/archiv/obalky.tex +++ b/seminar/templates/seminar/archiv/obalky.tex @@ -1,79 +1,94 @@ {% autoescape off %} {% load staticfiles %} {% load tex %} -\input czech.sty -\input epsf -\special{landscape} -\nopagenumbers -\hoffset=-1in -\voffset=-1in -\advance\voffset by 0.9cm -%nove pridano, aby to fungovalo... -\advance\hoffset by 6.5cm -\hsize=22cm -\vsize=16cm - -\font\adrfonta=csssbx10 at 14pt -\font\adrfontb=csssbx10 at 12pt -\font\adrfontc=csss12 -\font\tofont=csr12 at 16pt - -\newdimen\fromskip -\newdimen\toskip -\fromskip=4.35cm -\toskip=13.2cm - -\def\first{\relax} +\documentclass[11pt,a4paper,landscape]{article} +\usepackage[top=3.75cm,left=8cm]{geometry} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[czech]{babel} +\usepackage{graphicx} +\begin{document} + +% Nechceme číslování stránek +\pagenumbering{gobble} + +% Různé fonty na obálce +\def\adrfonta#1{% +\fontsize{14pt}{14.5pt}\selectfont \textbf{\textsf{#1}}%Časopis M&M +} +\def\adrfontb#1{% +\fontsize{12pt}{13pt}\selectfont \textbf{\textsf{#1}}%OPMK UK MFF +} +\def\adrfontc#1{% +\fontsize{12pt}{13pt}\selectfont \textsf{#1}%Adresa, telefon, e-mail +} +\def\tofont#1{% +\fontsize{16pt}{18pt}\selectfont #1%Adresa řešitele +} +%Podtržítko je znak \catcode`_=13 -%\catcode`_=12 - \def_{$\_$} -\advance\voffset by 2.5cm - - -\def\obalka#1#2#3#4#5#6#7{ - -\def\jmeno{#1} -\def\prijm{#2} -\def\skola{#3} -\def\popis{} -\def\first{} -\def\ulice{#4} -\def\PSC{#5} -\def\mesto{#6} -\def\stat{#7} -\vskip-4mm\vbox to 0pt{\hbox to 0pt{\hskip1.4cm\epsfysize=2.55cm\epsfbox{lisak.eps}\hss}\vss} +% Odsazení různých adres +\parindent=0pt +%\newdimen\fromskip +\newdimen\toskip +%\fromskip=4.35cm +\toskip=11.7cm + +% Předsunutí -- na PSČ +\def\predsunout#1{% +\setbox0=\hbox{#1\,}% +\hskip -\wd0\relax% +\box0 +} -\baselineskip=13pt -\parindent=\fromskip -\line{\indent\adrfonta Časopis M\&M,\hfil} -\vskip3pt -\line{\indent\adrfontb OPMK UK MFF\hfil} -\vskip3pt -\line{\indent\adrfontc Ke Karlovu 3, 121 16 Praha 2\hfil} -\line{\indent\adrfontc Tel.: +420 221 911 235\hss} -\line{\indent\adrfontc mam@atrey.karlin.mff.cuni.cz\hfil} +% Makro na TeXáni naší adresy +\def\adresaMaM{% +\hbox{\adrfonta{Časopis M\&M,}} +\vskip 3 pt +\hbox{\adrfontb{OPMK UK MFF}} +\vskip 3 pt +\hbox{\adrfontc{Ke Karlovu 3, 121 16 Praha 2}} +\hbox{\adrfontc{Tel.: +420 221 911 235}} +\hbox{\adrfontc{mam@matfyz.cz}} +} -\vskip6.15cm -\vbox to 0pt{\parindent=1.4cm\hsize=\toskip\advance\hsize by -1cm -\vbox to 60pt{\vfil} \popis\vss} -\parindent=\toskip -\baselineskip=18pt -\line{\indent\tofont\first\hfil} -\line{\indent\tofont\jmeno\ \prijm\hfil} +% Makro na TeXání adresátovy adresy +\def\adresat#1#2#3#4#5#6#7{% +\def\jmeno{#1}% +\def\prijm{#2}% +\def\skola{#3}% +%\def\popis{} +%\def\first{} +\def\ulice{#4}% +\def\PSC{#5}% +\def\mesto{#6}% +\def\stat{#7}% + +\hbox{\tofont{\jmeno\ \prijm}} \ifx \skola \empty {} \else -\line{\indent\tofont\skola\hfil} +\hbox{\tofont{\skola}} \fi -\line{\indent\tofont\ulice\hfil} -\line{\tofont\item{\PSC} \mesto\hfil} -\vskip5pt -\line{\indent\tofont\stat\hfil} +\hbox{\tofont{\ulice}} + +\hbox to 18pt{\tofont{\predsunout{\PSC\ }\mesto}} +\vskip 5 pt +\tofont{\stat} +} -\vfil\eject +% Tohle makro vysází samotnou obálku +\def\obalka#1#2#3#4#5#6#7{ +% Horní a pravý okraj je zároveň okraj stránky, resetujeme odsazení +\includegraphics[height=2.55cm]{lisak.eps}\hskip 1 em\vbox{% +\adresaMaM} +\vskip 7.3 cm % Od oka +\hskip\toskip% +\vbox{\adresat{#1}{#2}{#3}{#4}{#5}{#6}{#7}} +\vfill\eject } @@ -98,6 +113,6 @@ {% endif %} {% endspaceless %} {% endfor %} -\bye +\end{document} {% endautoescape %} diff --git a/seminar/views.py b/seminar/views.py index a42e697d..7d822da5 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -568,8 +568,7 @@ def obalkyView(request,resitele): with open(tempdir+"/obalky.tex","w") as texfile: texfile.write(tex) shutil.copy(os.path.join(settings.STATIC_ROOT, 'seminar/lisak.eps'),tempdir) - subprocess.call(["csplain","obalky.tex"],cwd = tempdir) - subprocess.call(["dvipdf","obalky.dvi"],cwd = tempdir) + subprocess.call(["pdflatex","obalky.tex"],cwd = tempdir) with open(tempdir+"/obalky.pdf","rb") as pdffile: response = HttpResponse(pdffile.read(),content_type='application/pdf') From 5700b468588a3af0f5fcdea7eb50cbeaaccfd6eb Mon Sep 17 00:00:00 2001 From: "Tomas \"Jethro\" Pokorny" Date: Fri, 14 Sep 2018 19:04:40 +0200 Subject: [PATCH 06/12] Opraveno porovnavani v templatech pomoci '=' --- korektury/templates/korektury/opraf.html | 22 +++++++++---------- korektury/templates/korektury/seznam.html | 2 +- .../seminar/archiv/cislo_vysledkovka.tex | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/korektury/templates/korektury/opraf.html b/korektury/templates/korektury/opraf.html index 946edaab..fccfc53b 100644 --- a/korektury/templates/korektury/opraf.html +++ b/korektury/templates/korektury/opraf.html @@ -7,10 +7,10 @@ Korektury {{pdf.nazev}} - +

Korektury {{pdf.nazev}}

- {% if pdf.status = 'zanaseni' %}

Probíhá zanášení korektur, zvažte, zda chcete přidávat nové

{% endif %} - {% if pdf.status = 'zastarale' %}

Toto PDF je již zastaralé, nepřidávejte nové korektury

{% endif %} + {% if pdf.status == 'zanaseni' %}

Probíhá zanášení korektur, zvažte, zda chcete přidávat nové

{% endif %} + {% if pdf.status == 'zastarale' %}

Toto PDF je již zastaralé, nepřidávejte nové korektury

{% endif %} {{pdf.komentar}}
Klikni na chybu, napiš komentář | @@ -60,11 +60,11 @@ {% csrf_token %} - Přidávání korektur + Přidávání korektur
- Zanášení korektur + Zanášení korektur
- Zastaralé, nekorigovat + Zastaralé, nekorigovat
@@ -81,12 +81,12 @@ {% for o in opravy %}
+ class='pointer{%if o.status == 'opraveno' %}-done{% elif o.status == 'neni_chyba' %}-wontfix{% elif o.status == 'k_zaneseni' %}-ready{% endif %}'>
+ class='box{%if o.status == 'opraveno' %}-done{% elif o.status == 'neni_chyba' %}-wontfix{% elif o.status == 'k_zaneseni' %}-ready{% endif %}' + onmouseover='box_onmouseover(this,{% if o.status == 'opraveno' %}"done"{% elif o.status == 'neni_chyba' %}"wontfix"{% elif o.status == 'k_zaneseni' %}"ready"{% else %}""{% endif %})' + onmouseout='box_onmouseout(this, {% if o.status == 'opraveno' %}"done"{% elif o.status == 'neni_chyba' %}"wontfix"{% elif o.status == 'k_zaneseni' %}"ready"{% else %}""{% endif %})'>
{{o.autor}} @@ -142,7 +142,7 @@ {% endif %} - {% if o.status = 'opraveno' or o.status = 'neni_chyba' %} + {% if o.status == 'opraveno' or o.status == 'neni_chyba' %} diff --git a/korektury/templates/korektury/seznam.html b/korektury/templates/korektury/seznam.html index 991ca2c5..7531679b 100644 --- a/korektury/templates/korektury/seznam.html +++ b/korektury/templates/korektury/seznam.html @@ -17,7 +17,7 @@
    {% for pdf in object_list %} -
  • {{ pdf.nazev }} {{pdf.komentar}} {{pdf.pdf.name}}
    • +
  • {{ pdf.nazev }} {{pdf.komentar}} {{pdf.pdf.name}}
    • {% empty %}
  • Nejsou žádné dokumenty ke korekturování. {% endfor %} diff --git a/seminar/templates/seminar/archiv/cislo_vysledkovka.tex b/seminar/templates/seminar/archiv/cislo_vysledkovka.tex index 5ad8615a..68baec9b 100644 --- a/seminar/templates/seminar/archiv/cislo_vysledkovka.tex +++ b/seminar/templates/seminar/archiv/cislo_vysledkovka.tex @@ -1,6 +1,6 @@ \setlength{\tabcolsep}{3pt} \begin{longtable}{|r|l|c|r|{% for p in problemy %}c@{\hskip.5em}{% endfor %}|r|r|}\hline -& & & & \multicolumn{ {{ problemy|length}} }{c|}{\textbf{Úlohy}} & & \\\textbf{Poř.}& \textbf{Jméno}& \textbf{R.}& \raisebox{0.7mm}{$\sum_{-1}$}& {% for p in problemy %}{% if p.typ == "uloha" %}\textbf{r{{p.kod}}}&{% elif p.typ = "tema" %}\textbf{t{{p.kod}}}&{% else %}\textbf{ {{p.kod}} }&{% endif %}{% endfor %}\raisebox{0.7mm}{$\sum_0$}&\raisebox{0.7mm}{$\sum_1$}\\\hline +& & & & \multicolumn{ {{ problemy|length}} }{c|}{\textbf{Úlohy}} & & \\\textbf{Poř.}& \textbf{Jméno}& \textbf{R.}& \raisebox{0.7mm}{$\sum_{-1}$}& {% for p in problemy %}{% if p.typ == "uloha" %}\textbf{r{{p.kod}}}&{% elif p.typ == "tema" %}\textbf{t{{p.kod}}}&{% else %}\textbf{ {{p.kod}} }&{% endif %}{% endfor %}\raisebox{0.7mm}{$\sum_0$}&\raisebox{0.7mm}{$\sum_1$}\\\hline \endhead \hline \endfoot From faed08ae8455b23eec7d18bfb208e5e87462d420 Mon Sep 17 00:00:00 2001 From: MaM Web user Date: Fri, 14 Sep 2018 20:24:00 +0200 Subject: [PATCH 07/12] =?UTF-8?q?Ob=C3=A1lky:=20Zv=C4=9Bt=C5=A1en=C3=AD=20?= =?UTF-8?q?mezer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/archiv/obalky.tex | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seminar/templates/seminar/archiv/obalky.tex b/seminar/templates/seminar/archiv/obalky.tex index 07574560..4995d105 100644 --- a/seminar/templates/seminar/archiv/obalky.tex +++ b/seminar/templates/seminar/archiv/obalky.tex @@ -68,13 +68,16 @@ \def\stat{#7}% \hbox{\tofont{\jmeno\ \prijm}} +\vskip .2 em \ifx \skola \empty {} \else \hbox{\tofont{\skola}} \fi +\vskip .2 em \hbox{\tofont{\ulice}} - +\vskip .2 em +\vskip .2 em \hbox to 18pt{\tofont{\predsunout{\PSC\ }\mesto}} \vskip 5 pt \tofont{\stat} From 5b9f8416d47ab3770919218a273383a20a6c04eb Mon Sep 17 00:00:00 2001 From: LEdoian Date: Fri, 14 Sep 2018 20:30:54 +0200 Subject: [PATCH 08/12] =?UTF-8?q?Zm=C4=9Bna=20e-mailov=C3=A9=20konference?= =?UTF-8?q?=20na=20chyby?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/settings_prod.py | 2 +- mamweb/settings_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mamweb/settings_prod.py b/mamweb/settings_prod.py index 3c6f0f72..bd51d5e7 100644 --- a/mamweb/settings_prod.py +++ b/mamweb/settings_prod.py @@ -50,7 +50,7 @@ SERVER_EMAIL = 'mamweb-prod-errors@mam.mff.cuni.cz' ADMINS = [ ('Tomas Gavenciak', 'gavento@gmail.com'), ('Matěj Kocián', 'matej.kocian@gmail.com'), - ('M&M ERRORs', 'mam-errors@atrey.karlin.mff.cuni.cz'), + ('M&M ERRORs', 'mam-errors@mam.mff.cuni.cz'), ] diff --git a/mamweb/settings_test.py b/mamweb/settings_test.py index 0cc44a64..9f971f45 100644 --- a/mamweb/settings_test.py +++ b/mamweb/settings_test.py @@ -52,7 +52,7 @@ import os SERVER_EMAIL = 'mamweb-test-errors@mam.mff.cuni.cz' ADMINS = [ - ('M&M ERRORs', 'mam-errors@atrey.karlin.mff.cuni.cz'), + ('M&M ERRORs', 'mam-errors@mam.mff.cuni.cz'), ] From cfa9bd90567cbc3db259c10dcbf9ff2a0df4c2dd Mon Sep 17 00:00:00 2001 From: "Tomas \"Jethro\" Pokorny" Date: Fri, 14 Sep 2018 20:31:18 +0200 Subject: [PATCH 09/12] select_related musi odkazovat na klic, nikoli atribut. --- seminar/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/seminar/views.py b/seminar/views.py index 7d822da5..0f7ebc1c 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -502,7 +502,7 @@ class CisloView(generic.DetailView): class ArchivTemataView(generic.ListView): model = Problem template_name = 'seminar/archiv/temata.html' - queryset = Problem.objects.filter(typ=Problem.TYP_TEMA, stav=Problem.STAV_ZADANY).select_related('cislo_zadani__rocnik__rocnik').order_by('-cislo_zadani__rocnik__rocnik', 'kod') + queryset = Problem.objects.filter(typ=Problem.TYP_TEMA, stav=Problem.STAV_ZADANY).select_related('cislo_zadani__rocnik').order_by('-cislo_zadani__rocnik__rocnik', 'kod') ### Generovani vysledkovky @@ -704,12 +704,12 @@ def soustredeniUcastniciExportView(request,soustredeni): class ClankyResitelView(generic.ListView): model = Problem template_name = 'seminar/clanky/resitelske_clanky.html' - queryset = Problem.objects.filter(typ=Problem.TYP_RES_CLANEK, stav=Problem.STAV_ZADANY).select_related('cislo_zadani__rocnik__rocnik').order_by('-cislo_zadani__rocnik__rocnik', 'kod') + queryset = Problem.objects.filter(typ=Problem.TYP_RES_CLANEK, stav=Problem.STAV_ZADANY).select_related('cislo_zadani__rocnik').order_by('-cislo_zadani__rocnik__rocnik', 'kod') class ClankyOrganizatorView(generic.ListView): model = Problem template_name = 'seminar/clanky/organizatorske_clanky.html' - queryset = Problem.objects.filter(typ=Problem.TYP_ORG_CLANEK, stav=Problem.STAV_ZADANY).select_related('cislo_zadani__rocnik__rocnik').order_by('-cislo_zadani__rocnik__rocnik', 'kod') + queryset = Problem.objects.filter(typ=Problem.TYP_ORG_CLANEK, stav=Problem.STAV_ZADANY).select_related('cislo_zadani__rocnik').order_by('-cislo_zadani__rocnik__rocnik', 'kod') ### Status From eb265b6fb865114c87cbbfc5240affdae23029af Mon Sep 17 00:00:00 2001 From: LEdoian Date: Fri, 14 Sep 2018 22:24:52 +0200 Subject: [PATCH 10/12] =?UTF-8?q?CKEditory=20umo=C5=BE=C5=88uj=C3=AD=20upl?= =?UTF-8?q?oad=20obr=C3=A1zk=C5=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/admin.py | 4 ++-- seminar/admin.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mamweb/admin.py b/mamweb/admin.py index 402f34ca..b483bf18 100644 --- a/mamweb/admin.py +++ b/mamweb/admin.py @@ -6,10 +6,10 @@ from django.contrib.flatpages.admin import FlatPageAdmin as FlatPageAdminOld from django.contrib.flatpages.admin import FlatpageForm as FlatpageFormOld from django import forms -from ckeditor.widgets import CKEditorWidget +from ckeditor_uploader.widgets import CKEditorUploadingWidget class FlatpageForm(FlatpageFormOld): - content = forms.CharField(widget=CKEditorWidget()) + content = forms.CharField(widget=CKEditorUploadingWidget()) class Meta: model = FlatPage # this is not automatically inherited from FlatpageFormOld exclude = [] diff --git a/seminar/admin.py b/seminar/admin.py index 1532b54d..29363f68 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -5,7 +5,7 @@ from django import forms from django.forms import widgets from reversion.admin import VersionAdmin from solo.admin import SingletonModelAdmin -from ckeditor.widgets import CKEditorWidget +from ckeditor_uploader.widgets import CKEditorUploadingWidget from django.db.models import Count from django.db import models from django.utils.safestring import mark_safe @@ -402,9 +402,9 @@ from autocomplete_light.contrib.taggit_field import TaggitField, TaggitWidget class ProblemAdminForm(forms.ModelForm): - text_zadani = forms.CharField(widget=CKEditorWidget(), required=False, **field_labels(Problem, 'text_zadani')) - text_reseni = forms.CharField(widget=CKEditorWidget(), required=False, **field_labels(Problem, 'text_reseni')) - text_org = forms.CharField(widget=CKEditorWidget(), required=False, **field_labels(Problem, 'text_org')) + text_zadani = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Problem, 'text_zadani')) + text_reseni = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Problem, 'text_reseni')) + text_org = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Problem, 'text_org')) zamereni = TaggitField(widget=TaggitWidget('TagAutocomplete'), required=False) autor = UserModelChoiceField(User.objects.filter(is_staff=True)) opravovatel = UserModelChoiceField(User.objects.filter(is_staff=True), required=False) @@ -536,9 +536,9 @@ create_modeladmin(ProblemZadanyAdmin, Problem, 'ProblemZadany', verbose_name=u'P ### Prispevek (k tematkum) class PrispevekAdminForm(forms.ModelForm): - text_org = forms.CharField(widget=CKEditorWidget(), required=False, + text_org = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Prispevek, 'text_org')) - text_resitel = forms.CharField(widget=CKEditorWidget(), required=False, + text_resitel = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Prispevek, 'text_resitel')) class Meta: @@ -554,7 +554,7 @@ admin.site.register(Prispevek, PrispevekAdmin) ### Soustredeni class SoustredeniAdminForm(forms.ModelForm): - text = forms.CharField(widget=CKEditorWidget(), required=False, **field_labels(Soustredeni, 'text')) + text = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Soustredeni, 'text')) class Meta: model = Soustredeni exclude = [] @@ -595,7 +595,7 @@ admin.site.register(Konfera,KonferaAdmin) ### Novinky class NovinkyAdminForm(forms.ModelForm): - text = forms.CharField(widget=CKEditorWidget(), required=False, + text = forms.CharField(widget=CKEditorUploadingWidget(), required=False, **field_labels(Novinky, 'text')) autor = UserModelChoiceField(User.objects.filter(is_staff=True)) From a7108478634eea45c6c38dec6dfc8b0267781305 Mon Sep 17 00:00:00 2001 From: MaM Web user Date: Fri, 14 Sep 2018 22:28:16 +0200 Subject: [PATCH 11/12] Gitignore: ignorovat .htpasswd --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 2b08d3e8..a61902a0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ # org poznamky schemata TODO + +# .htpasswd kvůli přihlášení +.htpasswd From 938974bb19f75f9069c5cc17509cd8ca32f6b1b8 Mon Sep 17 00:00:00 2001 From: LEdoian Date: Fri, 14 Sep 2018 22:42:58 +0200 Subject: [PATCH 12/12] =?UTF-8?q?P=C5=99id=C3=A1n=20ckeditor=5Fuploader=20?= =?UTF-8?q?do=20settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Opravuje nefunkční výběr obrázku, nevím jak. --- mamweb/settings_common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mamweb/settings_common.py b/mamweb/settings_common.py index b91deb07..6d171ca0 100644 --- a/mamweb/settings_common.py +++ b/mamweb/settings_common.py @@ -100,6 +100,7 @@ INSTALLED_APPS = ( 'django_countries', 'solo', 'ckeditor', + 'ckeditor_uploader', 'taggit', 'autocomplete_light',