diff --git a/jm2l/templates/Staff/compta.mako b/jm2l/templates/Staff/compta.mako index e996274..ea8feb3 100644 --- a/jm2l/templates/Staff/compta.mako +++ b/jm2l/templates/Staff/compta.mako @@ -3,9 +3,6 @@ <%namespace name="helpers" file="jm2l:templates/helpers.mako"/> <%namespace name="h" file="jm2l:templates/helpers.mako"/> <%def name="jsAddOn()"> - - - <%def name="cssAddOn()"> @@ -58,19 +55,18 @@ % if one_dic.has_key("Justif"): - ${h.uploader("Justif", one_dic["User"]["uid"], "Justif")} + ${h.uploader("Justif", one_dic["User"]["uid"], "Justif_"+one_dic["User"]["slug"], True)} % else: - Rien + Rien % endif - - + % if one_dic.has_key("RIB"): - ${h.uploader("RIB", one_dic["User"]["uid"], "RIB")} + ${h.uploader("RIB", one_dic["User"]["uid"], "RIB_"+one_dic["User"]["slug"], True)} % else: - Rien + Rien % endif % endfor diff --git a/jm2l/templates/helpers.mako b/jm2l/templates/helpers.mako index 55b49e2..c214a77 100644 --- a/jm2l/templates/helpers.mako +++ b/jm2l/templates/helpers.mako @@ -217,13 +217,17 @@ TabJs = {'select':[], 'desc':[]} ## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= ## Wrapper pour uploader ## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -<%def name="uploader(MediaType, UID, desc=None)"> \ +<%def name="uploader(MediaType, UID, desc=None, disp_only=False)"> \ -
+ % if disp_only: + + % else: + + % endif -
+
diff --git a/jm2l/upload.py b/jm2l/upload.py index 7f0d623..c586378 100644 --- a/jm2l/upload.py +++ b/jm2l/upload.py @@ -186,6 +186,10 @@ class MediaUpload(MediaPath): def __init__(self, request): self.request = request self.media_table = self.request.matchdict.get('media_table') + self.display_only = False + if self.media_table.startswith('_'): + self.display_only = True + self.media_table = self.media_table[1:] self.linked_id = self.request.matchdict.get('uid') if not self.linked_id.isdigit(): raise HTTPBadRequest('Wrong Parameter') @@ -398,14 +402,15 @@ class MediaUpload(MediaPath): info['thumbnailUrl'] = self.ExtMimeIcon(mime) else: info['thumbnailUrl'] = self.ExtMimeIcon(mime) - info['deleteType'] = DELETEMETHOD - info['deleteUrl'] = self.request.route_url('media_upload', - sep='', - name='', - media_table=self.media_table, - uid=self.linked_id) + '/' + name - if DELETEMETHOD != 'DELETE': - info['deleteUrl'] += '&_method=DELETE' + if not self.display_only: + info['deleteType'] = DELETEMETHOD + info['deleteUrl'] = self.request.route_url('media_upload', + sep='', + name='', + media_table=self.media_table, + uid=self.linked_id) + '/' + name + if DELETEMETHOD != 'DELETE': + info['deleteUrl'] += '&_method=DELETE' return info else: return None