From 89fa8910dec00f49264e4b96b73f9a02a61b64dc Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Mon, 16 Dec 2019 16:52:35 +0100 Subject: [PATCH] Neuer Editor Und Suche sollte nun laufen - das war eine alte File?!?!? --- .../__pycache__/urls.cpython-38.pyc | Bin 2055 -> 1941 bytes digitaleagentur/urls.py | 8 +++--- news/__pycache__/forms.cpython-38.pyc | Bin 1307 -> 943 bytes news/__pycache__/models.cpython-38.pyc | Bin 1455 -> 1392 bytes news/__pycache__/views.cpython-38.pyc | Bin 3524 -> 3365 bytes news/forms.py | 14 +++++----- news/models.py | 5 ++-- news/templates/news/news_addnews.html | 11 +++++--- news/templates/news/news_update.html | 11 +++++--- news/views.py | 25 +++++++++--------- orga/templates/orga/orga_main.html | 3 --- standards/__pycache__/forms.cpython-38.pyc | Bin 3023 -> 3060 bytes standards/__pycache__/models.cpython-38.pyc | Bin 1698 -> 1635 bytes standards/__pycache__/views.cpython-38.pyc | Bin 6189 -> 6189 bytes standards/forms.py | 6 +++-- standards/models.py | 5 ++-- .../templates/standards/standards_add.html | 9 +++++-- .../templates/standards/standards_update.html | 9 ++++--- standards/views.py | 2 ++ users/__pycache__/usersforms.cpython-38.pyc | Bin 4801 -> 4801 bytes users/__pycache__/views.cpython-38.pyc | Bin 14950 -> 14950 bytes users/templates/users/base.html | 5 ++++ users/templates/users/support.html | 7 +++++ users/views.py | 1 + 24 files changed, 77 insertions(+), 44 deletions(-) diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc index 370844a8fd15f3561d1dbd218d667c394ee82bbb..7905a5b52836dcc0049a29b416dcfcccdf6d9b94 100644 GIT binary patch delta 61 zcmZn{n99!^%FD~e00dK(evg%($ScdZX`}W=Mz$35UQH3STcXkZ+mF zl48}&*vyp9WX=#Jmtq~vplP%D5o0Q|Ta`d^c4|syNq&)jX+chYVv7DPewau+M5Kxn xCZJy>24h0yQj7FTi*kxLyR&X)WK#w@r$~7cdnBX7@Xkyn<{ZKAfZggZkDTMBy%LkfE;a~5kea}-AkM=*mX z=fo-26CWl9`2aPfGDI<^Fhnt>GDoqbFs3l2FsHDju+CwLVg+eU;Yi_3XNh7 QV+3ghIhKbJ3|WK(0MuSYEC2ui delta 669 zcmZ`$PfHs?6rVS<+1+e*gQixZ{c|Z4mKHBU4=SZaM2ol=D}^aNguEd}V*;~lg#l=G6v)cu00j3Y>GI{zb@8d7*?0pSFoM+?58%i zOqLHC$r^PqLIVmdjnWPRN>u3dl`dfkUG!Q?yN3F3<-WwqG2FE<>`U!qM186S!h(!d zaSAU&%hTHmLs(qEFSpKWz4$KIKi5e0!I2W^{&q`&tU~pVoh5g2=GaM&v O;JP6}2-jEDCawTFr+lvf diff --git a/news/__pycache__/models.cpython-38.pyc b/news/__pycache__/models.cpython-38.pyc index bd27abd0cade6d3db163283772d0517504f7e9a5..98b06b301b5955cd0df1ccea2bc3b8cd3bac71ca 100644 GIT binary patch delta 372 zcmZ3_{eg=wl$V!_0SKCxevf5goyaG{7&TGbUBaCqg*}C%g&~C_l`)IEnK_Clg*BK# zlXK!UgNYBc823%)X4GL~&YEn_c*~gwsQngCS!z*IesOAiUSe*lCQ}hFP_PIj6UCjE zT3#HVo1YS&ROzS5T*LuZUX+@XSdy9oR$jzAIfTicQDpKICND~{2^>G zz{J2uL}Fw`d;)eruwcu_zVCo$;4(8jp9~k5lc8viW9xB zBdH@{6>GN=)&QLvH%i~c*+a=H#CPp_?Z6$Lbm21WO^NSd*BfuUKyduHjGp87C00hs zrortK{T%4P55V@E30N{U`6U%E{h|jKfj#lDJ-FJp6so0k3d9Kkr*vwvw!DF=Y%1@f z278jdRzt|k0;<1I6T;FMLfaVxK8ZrGBTAaAt6Xcdf|cXI-jsN!E~+^Jf9mukEU3ys zd?FB)Dwj|R=^QI^8HCTZHJ2$s@NA{u@OM8dBGAp%mU1Pjq>yJMxhcsJ45 zr4n+q65A6$B&xaQusIN^2jIYkBL`0X0}%3sUbrE_jSEP;_q=5*QCsu%*W)+i@%y~- zPYYk4@veHFt-*2c^sl|`+ujoU<@UwB5z~Ywte`k3wMyi3L3vPamC4&dWl(KZ$vZ)9 zP;b?lwxtPIc(*j+`G%hz8?A<45_wU$rHxr@9{ijrl0O5HB~gaRGDO-Cxd2ZqqDoH} zMQvAWDu;cVXNj}p-wZc}z{~gFvUSD^>NoxwtE)r(eYT?R>ivxsSbO5N+ufiOhFw1h z+HLtb^ri9`x{D|!5D!{tfLP2hsHe-+S59N}JM_g`UlZ&jF7HMRJcp(W{v|(RF`F1C zn*14i`kB5Nv$lyIuG#6;f|%Ti#II*%J=0t_f?*cD12PAApNzxOkBh_Ax)wqdG)7 zu|C!z!|qOEyz}<%yLVV(_0$iU_bL_0L6ax;@IVea!Rw&1rY@U{%|>Dl{OJ0DkeEOD z6v`q93=G>JcY>afOW1c-ePUiR3uqha8*^>+G}
nP8l%z-4?@J6@mhoRK5i-R-` zxq$vzkd`&{Z?>U@@=@%Y(L|6*c3Ko?;U-)I(YVd#42!wU!jqfmxW&|dwmiyk&i^qp z@@0tY;+yUt88BE1uRsfb1c|gh1L{mLNZXV?RKsy(0OL%|g$}i#$NI#CS~&e*bQaKA zQEp-rTS#-?6~_FCK+{c1F;70FSRkLBQsN{)MBi1@)8zA4aE{y8Z#ewr6iN5bg z@;SVn0e>EEk-B^VC8dn+C6o=68RQxG7x4iymzyZWn^s8BGXy>1J+UY2_#E*+6uOPj zuO5m{z;{y6eP^j?e=Rws+e-I2Bs6Xtr>Ju1p31t<9GWVofcg|hG7Q`rF14+o&P$*T?{Xw~-R6T5KP?mOk!~MVy z)uvm{z6s-ZnoH^f_f(nQc|VWyA-g0m`kmqa!D{zl7|GtXbYIq{oj0Oh5Uygf4?8mS qWf6zr50ti%+(L)nB60o)zBJ91`ocTcxDUhCOGVD?CbZ>}!`Z*atwlQk delta 1827 zcmZuyO^@3|7@iNuaqQTe?_|Hap}U}l(ghZ^%alyzf@*7?dFGvWV$b_L<9xO7 z!=k-w+a`hQ+s*qouivwm>CgAh-kgle-7+PD2*a<8s@7etp#FHWat~ z=BU+eQF4WdqOk80VSAdFKh(POUR5|^?k+i`-38z!QC55rGAp7AnN`R%A#(|4Yoe}Z zmqpC!Cr_}%+V<`QmxRDBDL*pU5`%DGo_s+sP+E$AVxQ7he1qShtMLgRPF7(%iS4?5 zzZV33&-Yzdo`qNn9c0fSQ~_*gfd*huO;eFRh0%j62Lxx|gcdBoOhkr6&<~mXBc#9? zG%na@?0|+^HlCyb7O`pWn8@EFn)Q%6)Q9Ip>;?OIL@jS zJX^uD72GX^#i@NvBJMg5*<3`2CBY~27%oQ)2Abj(HIY-is<^IrE#leZ>eEIl^j+NG~94BD{!Dj=$8K@8;wZ4qifd8K7&7y*nd}LJqd!p$;lP7-^9<&4Xut1YuPFpWm3^j~EdH@y)3P;xo4x@u96$X0D?+s?6Lu z#ZhJEmLd&u@`{5irWG_=Se@2DIYTL47X_tw4PFgji>lX3nHKR#6DGK+u_>%0?I0I6 zVPP@KDaq~aZ>Vg;Zd3JMKsJ*jl_-ANSg9yOXfsW~0`D1Xla?&vk_CW-?|Gqo1&1>` zpcCY)2+A0*Axk}g>=MEo2>*X3#x5e15l|D!5!whSTSrHeOi04OU@eS3w98{nVxmcQ zZ;M{&U4iUi9e^;0n$)2VIK=^&zT0%o5>eAXVczyN^HA>K@0i|?CPtu0)n-mVdES*N?Gm&7`xwbarB*T#UV z<>QW-s^HFGyytro5(D+O!yE<&>K|Q`Z$oUmb1MGc`kF~67R5Dh4u22TP8>1pjraD~ z`}^Zi4sIz`lSUT&C>;2~Ix2I!Cj(Dba2bBw)ge`7PYa2Ucx3Bo@!~&=?G~PNb@NJ@ MQS%J6m5Rmazl=U+pa1{> diff --git a/news/forms.py b/news/forms.py index 497ac48..974e52e 100644 --- a/news/forms.py +++ b/news/forms.py @@ -2,7 +2,7 @@ from bootstrap_datepicker_plus import DatePickerInput from django import forms from django.forms import ModelForm from .models import News -from ckeditor.widgets import CKEditorWidget +#from ckeditor.widgets import CKEditorWidget class NewsAddNews(forms.ModelForm): @@ -13,14 +13,15 @@ class NewsAddNews(forms.ModelForm): labels = { "name" : "Titel", "go_online_on" : "Veröffentlichen", - "go_offline_on" : "Ins Archiv" + "go_offline_on" : "Ins Archiv", + "content" : "Inhalt" } - fields = ['name', 'go_online_on', 'go_offline_on'] + fields = ['name', 'go_online_on', 'go_offline_on', 'content'] widgets = { 'go_online_on': DatePickerInput(options={"format":'DD.MM.YYYY HH:mm', "locale":'de'}), 'go_offline_on': DatePickerInput(options={"format":'DD.MM.YYYY HH:mm', "locale":'de'}), } - +''' class NewsAddNewsEditor(forms.ModelForm): class Meta: @@ -29,7 +30,4 @@ class NewsAddNewsEditor(forms.ModelForm): "content" : "Inhalt" } fields = ['content'] - - - - \ No newline at end of file +''' \ No newline at end of file diff --git a/news/models.py b/news/models.py index 0c9ec2c..7ead2c3 100644 --- a/news/models.py +++ b/news/models.py @@ -3,14 +3,15 @@ from django.contrib.auth.models import User from users.models import Agency from django.urls import reverse import datetime -from ckeditor_uploader.fields import RichTextUploadingField +#from ckeditor_uploader.fields import RichTextUploadingField from bootstrap_datepicker_plus import DatePickerInput class News(models.Model): agency = models.ForeignKey(Agency, on_delete=models.CASCADE) name = models.CharField(max_length=200, blank=False, default="") - content = RichTextUploadingField(blank=True, verbose_name='Inhalt') + #content = RichTextUploadingField(blank=True, verbose_name='Inhalt') + content = models.TextField(blank=True, verbose_name='Inhalt') created_by = models.ForeignKey(User, on_delete=models.PROTECT) created_date = models.DateTimeField(default=datetime.datetime.now(), blank=True) diff --git a/news/templates/news/news_addnews.html b/news/templates/news/news_addnews.html index b00e2ff..c858488 100644 --- a/news/templates/news/news_addnews.html +++ b/news/templates/news/news_addnews.html @@ -7,12 +7,17 @@
{% csrf_token %} {{normalForm.media}} - {{normalForm|crispy}} - {{editorForm.media}} - {{editorForm}} + {{normalForm|crispy}}
  Abbrechen
+ {% endblock content %} \ No newline at end of file diff --git a/news/templates/news/news_update.html b/news/templates/news/news_update.html index bb7a26e..da53bfc 100644 --- a/news/templates/news/news_update.html +++ b/news/templates/news/news_update.html @@ -7,12 +7,17 @@
{% csrf_token %} {{normalForm.media}} - {{normalForm|crispy}} - {{editorForm.media}} - {{editorForm}} + {{normalForm|crispy}}
  Abbrechen
+ {% endblock content %} \ No newline at end of file diff --git a/news/views.py b/news/views.py index 2f81499..461fe6d 100644 --- a/news/views.py +++ b/news/views.py @@ -3,7 +3,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import CreateView, ListView, UpdateView, DetailView, DeleteView from django.contrib.auth.models import User from .models import News -from .forms import NewsAddNews, NewsAddNewsEditor +from .forms import NewsAddNews from django.contrib.auth.decorators import login_required from datetime import datetime from django.contrib import messages @@ -31,14 +31,15 @@ class NewsAddNews(LoginRequiredMixin, CreateView): def NewsAdd(request): if request.method == 'POST': normalForm = NewsAddNews(request.POST, instance=request.user) - editorForm = NewsAddNewsEditor(request.POST, instance=request.user) + #editorForm = NewsAddNewsEditor(request.POST, instance=request.user) - if editorForm.is_valid() and normalForm.is_valid(): + #if editorForm.is_valid() and normalForm.is_valid(): + if normalForm.is_valid(): normalForm.agency = request.user.profile.agency normalForm.created_by = request.user normalForm.last_modified_by = request.user normalForm.save() - editorForm.save() + #editorForm.save() new_news = News() new_news.agency = request.user.profile.agency new_news.created_by = request.user @@ -48,7 +49,7 @@ def NewsAdd(request): new_news.last_modified_on = datetime.now() new_news.name = normalForm.cleaned_data['name'] - new_news.content = editorForm.cleaned_data['content'] + new_news.content = normalForm.cleaned_data['content'] new_news.go_online_on = normalForm.cleaned_data['go_online_on'] new_news.go_offline_on = normalForm.cleaned_data['go_offline_on'] @@ -58,12 +59,12 @@ def NewsAdd(request): else: normalForm = NewsAddNews(instance=request.user) - editorForm = NewsAddNewsEditor(instance=request.user) + #editorForm = NewsAddNewsEditor(instance=request.user) context = { 'normalForm' : normalForm, - 'editorForm' : editorForm, + #'editorForm' : editorForm, 'active_link' : 'newsmanagement' } return render(request, 'news/news_addnews.html', context) @@ -73,28 +74,28 @@ def NewsUpdate(request, id): news = News.objects.get(pk=id) if request.method == 'POST': normalForm = NewsAddNews(request.POST, instance=news) - editorForm = NewsAddNewsEditor(request.POST, instance=news) + #editorForm = NewsAddNewsEditor(request.POST, instance=news) - if editorForm.is_valid() and normalForm.is_valid(): + if normalForm.is_valid(): news = News.objects.get(pk=id) news.last_modified_by = request.user news.last_modified_on = datetime.now() news.go_online_on = normalForm.cleaned_data['go_online_on'] news.go_offline_on = normalForm.cleaned_data['go_offline_on'] news.name = normalForm.cleaned_data['name'] - news.content = editorForm.cleaned_data['content'] + news.content = normalForm.cleaned_data['content'] news.save() messages.success(request, f'News aktualisiert!') return redirect('/news') else: normalForm = NewsAddNews(instance=news) - editorForm = NewsAddNewsEditor(instance=news) + #editorForm = NewsAddNewsEditor(instance=news) context = { 'normalForm' : normalForm, - 'editorForm' : editorForm, + #'editorForm' : editorForm, 'active_link' : 'newsmanagement', 'news_id' : news.pk, } diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html index 82fb7e2..952b1f9 100644 --- a/orga/templates/orga/orga_main.html +++ b/orga/templates/orga/orga_main.html @@ -77,9 +77,6 @@ function connectorDefaults(connector) { connector.targetDecorator.shape = 'None'; connector.type = 'Orthogonal'; connector.style.strokeColor = 'gray'; - - console.log(connector); - return connector; } diff --git a/standards/__pycache__/forms.cpython-38.pyc b/standards/__pycache__/forms.cpython-38.pyc index 67b284eb3ac13599e6cffd9e970ea521e5217f10..3aa40282bca13a54e6c0a0efebd49624d213f26c 100644 GIT binary patch delta 958 zcma)(O>5Lp6ox11&7CCU%+#6Mv@;#QTIWM5^;^awl_E&1R6*PfYK)UGN@FTFDOEQk z{s9+fE8<3EmTuho5A53P{RfH&g5Eb%8ifIya39Xix%WLM=iRoxS%usAyqS@Y_wL8t z%DxYUEydL2_Oe{zaeAd#6<2%BI-1MftgE|5k9D|f-paIc&!@;y%CxPt&&PZvcDgE+uaBvFNj1@YKn1SKTx8ky22|6E3~EFoG8dpSD30Q$@`0Q zF+*R}@7C^}ffDObw(Uo*DAL!ltI9N;V5>@vp0b5vqE&_9tVE4IvZWgn*d72Tff)eV zIB(ls-wDI6=lixThJ7G=4oFlC8R>F`41roG3xoQ6itcD{`l5tmd5JYqMwkkuZJ^po zxk8LM`L&Gtn~f!1tPPkL)!ZnZw!A(M9ThrEv@`UAZ|>QsDt+dYw47}&?@V5*{HJSF z3`ZLBHv6+)lUZ>PfHkdMSDvg73mitONT2lTrK1QJ0Zd(RU=BD2)PV-j1g3!&kOju+ zh+$n53y3ks78j=wp9aoIbWDGv*Yn)X&=av9Mo!>5!WCzcPi#!BK=teN%(yat0oioQ zsom%j$<*$}9lPt)F#GrS>i7d_jB;FD{I_)4-I7e)Bc6MC2!kKa3*Y|gb9k8E=VrCJ IQm)ka14Bio3jhEB delta 929 zcmaix&1(};6vbyIZ$6Tkq$a^h)1s}>$k=NAz}8x@MFmOGB9v~5b~0vyN@A2d1EQON zOE)6VrHI>r8+ZN#?gT+y&EH`W7ozt}paVM48QzaKbKg7fzH@%qU+m&mp^#JfdGYS& zo$vV%#V2Y`@aGzjpebLf_MtbKZQa*>!#D3`whiCfRGjRyn)K9){H89?j53iJcn`ag z@TluWBJ_eD6?r?AfC+g;YZ*06Yx0$Lt9*c`mMSz&<@dLtQ(f+AyY_f7*G6h&LCJL= z_*9gtxUSl=CDzp``C2TLVx>vQ%`&FtSFw7tjL!;C1?m8*QNeXPeJ=<)-G1M7Y1{>> z=Yd!y%QK5dfLmKyu`GA=kHg69JQ{@EK^PgW!F{hEZqPw&NfeSkaNGhE;A4CDJE+i-}M8T&Zd#{RUt=@Jx@W0THSxo}&~<)0rx&||0Y@4vl$V!_0SIO-{T{2rHjz(;v1p=pyo5VL3TFye3quN5Dq|LZGjo(c3VSev zCild3-qOh+^~it?$Z-JT;#ZUP7=4(SvnE$DzLw?#irnHUOD#&uFHVimOUzBxWGdnZ z3KsEAZeUU{23dQHrzkZiu_QGGEDx5A5-TlEEsD?0PsvQn1WFW_B<7_g7Nux17V%HM z%w*3fI$4<6pHY5tGINEf1jsmH5FrXD#3p}W7G+eP%*Ha6UkGFeXGm&AiCboBPRisZ zEIa(fK`N!-%8@jJ#5jQjHxL)g00|Bz0Y)%n;sdfom_(qMhlzs)tWr~O@+#IT&bL^7 p^HWlDz(Pna0UIp_H0KtF4bVTOIjMGxAfp9<1P>zuaxn5R0{}m%PH6xD delta 428 zcmaFNvxt{3l$V!_0SLMle2;y^I+0I?v2LPvyh;i~3TF;~u0WIkBZE6b3Renu3quNb zDr1&lGjo(s3VSevCeOr0-cp*3x5R=nlQTk6D@sBOa`F>XGV{{iGE;L>Ccc$od@-4W z(PwfP<7;VtpcS`x%2JDx@{3dB^AdAYHJOS8fPzK*lVg|^M7Y87MX5Q7C8;T3`67YI z6PV-}1tza&vS$>V{GQ35QEsw5bA`4fNS6qR5Q7uqAngL_sU`7=NyYg&r6sBHrA0YP zlOHip~OQ4jIaoXepp(l)sHirsFF*2^%yg_6dBjb+E?qU}iMU9vkx!8mRfh0E& Hb3$kUm|Y(C delta 109 zcmZ2$u-1S#l$V!_0SLMle2)#?$oqhYk#X`n9%V-6$wIt;8EZBR@U3KI?3lcZe+^^* z {% csrf_token %} {{normalForm|crispy}} - {{editorForm.media}} - {{editorForm}} +

Wenn ein Standard erstellt wurde, kann er nur von einer Person mit dem Recht Standards bearbeiten und freischalten veröffentlicht werden.

@@ -32,5 +31,11 @@ $("#id_area").change(function () { } }); }); +$(document).ready(function() { + $('#id_content').summernote({ + height: 400 + }); +}); + {% endblock content %} diff --git a/standards/templates/standards/standards_update.html b/standards/templates/standards/standards_update.html index dea388d..e818e89 100644 --- a/standards/templates/standards/standards_update.html +++ b/standards/templates/standards/standards_update.html @@ -7,8 +7,7 @@
{% csrf_token %} {{normalForm|crispy}} - {{editorForm.media}} - {{editorForm}} +

Wenn ein Standard bearbeitet wurde, kann er nur von einer Person mit dem Recht Standards bearbeiten und freischalten wieder veröffentlicht werden. Ein Standard wird nach Bearbeitung als Nicht veröffentlicht gesetzt.

  @@ -39,6 +38,10 @@ $("#id_area").change(function () { } }); }); - +$(document).ready(function() { + $('#id_content').summernote({ + height: 400 + }); +}); {% endblock content %} diff --git a/standards/views.py b/standards/views.py index 67b5ae2..60b239a 100644 --- a/standards/views.py +++ b/standards/views.py @@ -76,6 +76,7 @@ def StandardAdd(request): def StandardUpdate(request, id): standard = Standards.objects.get(pk=id) if request.method == 'POST': + #normalForm = StandardUpdateStandard(request.POST, instance=standard) normalForm = StandardUpdateStandard(request.POST, instance=standard) editorForm = StandardUpdateStandardEditor(request.POST, instance=standard) @@ -108,6 +109,7 @@ def StandardUpdate(request, id): return redirect('/standards') else: + #normalForm = StandardUpdateStandard(instance=standard) normalForm = StandardUpdateStandard(instance=standard) editorForm = StandardUpdateStandardEditor(instance=standard) diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc index 698c2ac2f647ad4bc817d498148400bae9136d09..e00b4158f6ba439b959527626f10ad59ed8bec8b 100644 GIT binary patch delta 19 ZcmX@8dQg=sl$V!_0SJtiZ{*r81OPAL1g!u7 delta 19 ZcmX@8dQg=sl$V!_0SLMlY~@~nh6l$V!_0SI(fe2*2_$Q!K9C^k7!`w-)%%_=&+EQ~ug7a1I8Vf?+>%=9HA Tqrqkcb9-iXWezqDXAV;UmKGAk delta 64 zcmaD>@~nh6l$V!_0SLMle2?YX$Q!K9C^|V&`w-*C%_=&+ER5SX7a1I8Vf?k(%=9HA TqyA--> + + + + @@ -315,6 +319,7 @@ + diff --git a/users/templates/users/support.html b/users/templates/users/support.html index 7b80976..751b46b 100644 --- a/users/templates/users/support.html +++ b/users/templates/users/support.html @@ -14,5 +14,12 @@ + {% endblock content %} diff --git a/users/views.py b/users/views.py index d2001ff..05e347b 100644 --- a/users/views.py +++ b/users/views.py @@ -423,6 +423,7 @@ def GlobalSearch(request): final_results_st.append(tempele) i += 1 ''' + #return JsonResponse({'standards' : final_results_st}) html = render_to_string('users/searchres.html', {'res_standard': res_standard, 'res_areas': res_areas, 'res_tasks': res_tasks, 'res_pers': res_pers}) return HttpResponse(html)