From ef068d1a99a6c798ff77196e52ce38e536314e07 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Fri, 20 Aug 2021 12:14:05 +0200
Subject: [PATCH] Standard Dateien verlinkung

---
 .../templates/standards/standards_add.html    |   9 +++++---
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 24911 -> 25914 bytes
 standards/templatetags/counter_tag.py         |  20 ++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html
index 264876e..f682829 100644
--- a/standards/templates/standards/standards_add.html
+++ b/standards/templates/standards/standards_add.html
@@ -5,7 +5,7 @@
 <div class="content-section col-12">  
 
   {% if update == True %}
-  <h3>Standard Bearbeiten{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Bearbeiten Sie hier einen bestehenden Standard." class="far fa-question-circle"></i></small>{% endif %}</h3>
+  <h3>Standard Bearbeiten {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Bearbeiten Sie hier einen bestehenden Standard." class="far fa-question-circle"></i></small>{% endif %}</h3>
   {% else %}
   <h3>Neuen Standard anlegen{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie hier einen neuen Standard an." class="far fa-question-circle"></i></small>{% endif %}</h3>
   {% endif %}
@@ -151,9 +151,12 @@
             </div>
           Verlinkte Dateien:
           <table id="linked_files" class="table table-hover table-sm">
+            <!-- TODO: Hier die NCFile-Daten abfragen -->
             {% if update == True %}              
-              {% for f in standard.addedfiles.all %}       
-                <tr id="added_files_{{f.pk}}"><td>{{f.name}}</td><td><button type="button" class="btn btn-danger btn-sm"  style="float: right;"  onclick="javascript:remEle('files',{{f.pk}}, '{{f.name}}')"><i class="fas fa-trash"></i></button></td></tr>
+              {% for f in standard.addedfiles_nc.all %}       
+                <!--<tr id="added_files_{{f.pk}}"><td>{{f.name}}</td><td><button type="button" class="btn btn-danger btn-sm"  style="float: right;"  onclick="javascript:remEle('files',{{f.pk}}, '{{f.name}}')"><i class="fas fa-trash"></i></button></td></tr>-->
+                {% getNCFileInfos request f.nc_id as filename %}
+                {{filename}}
               {% endfor %}
             {% endif %}
           </table>                
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index f4ce45281c655c14e5ccd853621cbcaa89bc5088..0f425a67ada3a8b5d74a94d90efe3893981fa242 100644
GIT binary patch
delta 3098
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

delta 2127
zcmZvc3s96*6vsX5KHO!1kmVt;Ac)|{A}k0hy0FVb9`5o`Kv*D=U?WCAxU2)BW29p>
z*5u<fjx#;9shlz`ZOhOyjW8XN5FcUdGe<K7$C_rEah$Sy?q@|aegnU~_uO;;_uPBV
zy+=;NP#^e|dwc69@o(L$4^|{}Zu1F)wu8ntl}b}ON&4J<NL4T$JlkV3!R^k9(JSBt
zR?IpNr?4m5fces9_znY&v+$u50Vgpu&Vlb4{cvlvHy>-jKjK2vr@1sECn;ipnr8?L
z2|EZM5>65Z@nDocwj1Zb5N-}IV4v}0ID+l*wQvrH<9p#OZl0ZBIzq0q33`Hq@DbrK
zhookS)ZRzfPZ-8uW>>)l%uaY2&f}ScXfF9%g8x+Et(@Tf4Yr$tF(Gl5;^HK1ulC2M
z{j}&xe8uZ5$pGOz>P!i~6u(E~?5b~G-QZ+GEl8-TWVKJoRRlnic`$;9O?##uBI_3%
zl1ARVn3zNp*_X08pZ|EY9jjYvpJC3rmFzf;9V7G+z9saFGg=j(!J(uX*q`i&J=IFQ
z6y%Ni<OTEoTSO_J>%Rvhuc2bJ#*;O7CdY$^CsmIoyB2RIS9_D%|DqM!WW8jbEGu0i
zx#J?Hm*zylW!yVw8(hP;bw;>?yEVbslQI*o<DL`;3~W#BfLrKFt%Msmm@2_fVw!Gl
zG~9M4&P`SX{Y+w+vU)7FMJn%L*Zc~&iD&2A;jV};DXj&1aaWoR?&Db6i25P-tp|MM
z8;my=H2d7+U5|Pdt7~m^vT>|h*a3js9D20rv^cgf3I@=}oC6wR+ghW=HglX>!4u3>
zxZ6ArrnoPeUj(&|EMC}<v6t7iuVs^ZDmT<CFw!23pIVq&)batbhjeQs=-su}An>9y
z8-2t-b`M|343~>7Tx7YD;?laBTAU5eW>=j@?W$vqP8aLN;Y`U(K1uGvj-e`R2Sj08
zwH^;-y`C#1>4J7oHqGqlo-(szf%xM&pu%AW3REOT<x#jASRn6vw9MI3*VM`jlue`Y
z!y?ePvJ)Z3J(&FgWQ)VzOY=p22a}VTx&hRpHSh3$@v$H>Me()-;+C-xZjb^o)EMIR
z12;3;8Vkj%iz4I=o5Y60Xc`43hZsX$C#iVLnVn7saa+DdYi@YRgd?Cy;WQjUh{Ud3
z29kR$cQW|Ja!VPbB(rhC7(U8d&U3mv-w7$$pFa$-xT9bZq~eu=q^FLOi%6A-u@?=C
zr^9^ASiDnV1{~DHqtceEumJATh2e9y5JfuRJDMPT!)8!e$r|^M<xkr*$iyIfCmh8s
zcC#W6&=L}cqjsCu7%jrX;t`>xun~%|uGoP6g(VgWmK6{t_;AO^XPasrZQ#98f0}FK
zZak+{^i|51&JGtV#L}V^SSr-sFUn7Rf)Fd_vl?|H@3y7uez#22;IqSub1=4qUSp-W
z)a#2gp%jl7N2&`cq%yoyY*j3i_pzuXO`A_v3ImrE1>l<{u~32iCHuj_BhaJWSL@!g
zBv}FXu&;D3jN=2&F*KFE261?-ECY=ASJ_6Gfg8$~!e@A~d>mTceam7Yc_rz(_`Y(>
zM#E{p;`yc;n~=vD<W$aWl8)tIXk`+lVPWMV=;Ze_4bvT^(9K&}>MkKB%K1Q`5`T3V
zU@adops~sdYp}V>4(lKH<F;4(davXDl8T8VUV~xPrO?B#R!`z8*&aYqh$77429K(Z
zHMP1}nmj08Au;H}h?*MMz=id=wWe0RksP|+`&OKT=iMZ6f^drPJz<D&j&Ol+kuXB|
zk>DX*CR`<4BU~rkBHSk2CEO>_^TvR$$CLyOVG4mBB&LUW&M0b%3no!3g<vLR5G({M
zArqzgu>3q~77>;b$_dK|6$A&NmC#A(Cafi_C-e|D5H`v;<*Rxhc-B2o-voaH_%Kg1

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 7ecf0b6..2b1f830 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -1110,3 +1110,23 @@ def getAbsenceLastHistory(absence):
 	return absence.history.first()
 
 
+'''
+	Dateinamen umbauen, damit im Standard die verlinkte Datei korrekt angezeigt wird.
+
+	TODO: Thread auf github beobachten, https://github.com/nextcloud/server/issues/17778 wenn dann displayname wieder bei WebDav geht!
+
+	Gibt den Dateinamen sauber als String zurück, wie sie in NC heißt!
+'''
+import urllib.parse
+@register.simple_tag
+def getNCFileInfos(request, ncid):
+	filesearchdata = '<?xml version="1.0" encoding="UTF-8"?><d:searchrequest xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns"><d:basicsearch><d:select><d:prop><d:displayname/></d:prop></d:select><d:from><d:scope><d:href>/files/' + request.user.username + '</d:href><d:depth>infinity</d:depth></d:scope></d:from><d:where><d:eq><d:prop><oc:fileid/></d:prop><d:literal>' + str(ncid) + '</d:literal></d:eq></d:where></d:basicsearch></d:searchrequest>'
+	r = requests.request("SEARCH", settings.NEXTCLOUD_URL +  "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml', 'Authorization' : "Bearer " + request.user.profile.nc_sid})
+	
+	split_response = r.text.split("<d:href>")
+	split_fileele = split_response[1].split("</d:href>")
+	split_filename = split_fileele[0].split("/")
+	split_filenameclear = split_filename[len(split_filename)-1]
+	return urllib.parse.unquote(split_filenameclear)
+
+