0001-do-not-depend-on-auquotidien-to-show-fargo-pick-a-fi.patch

Benjamin Dauvergne, 01 avril 2016 21:04

Voir les différences: en ligne côte à côte

Subject: [PATCH] do not depend on auquotidien to show fargo pick a file button

It also changes the behaviour from auquotien so that the button is hidden if is
user is not connected.

Dropbox picking link is placed inside the hint of the upload widgeet, hint of
the FileWithPreviewWidget is also moved there. qommon.fileupload.js and fargo.js
are modified to hide the link when the field is filled with a file.

 wcs/file_validation.py                    | 54 ++++++++++++++++++++++++++++++-
 wcs/qommon/form.py                        | 18 ++++++++++-
 wcs/qommon/static/css/qommon.css          |  5 +++
 wcs/qommon/static/js/fargo.js             |  1 +
 wcs/qommon/static/js/qommon.fileupload.js |  3 ++
 wcs/root.py                               |  4 ++-
 6 files changed, 82 insertions(+), 3 deletions(-)

     from qommon import get_logger
     from qommon.misc import http_get_page, json_loads, http_post_request
     from quixote import get_publisher, get_request, get_response
     import qommon.form
     from quixote import get_publisher, get_request, get_response, redirect, get_session
     from quixote.directory import Directory
     from quixote.html import TemplateIO, htmltext
     from wcs.api_utils import get_secret_and_orig, sign_url
-...
         get_response().add_after_job(
             N_('Sending file %s in portfolio of %s') % (filename, user.display_name),
             afterjob)
     class FargoDirectory(Directory):
         _q_exports = ['pick']
         @property
         def fargo_url(self):
             return get_publisher().get_site_option('fargo_url')
         def pick(self):
             request = get_request()
             if 'cancel' in request.form:
                 get_response().add_javascript(['jquery.js'])
                 get_response().page_template_key = 'iframe'
                 r = TemplateIO(html=True)
                 r += htmltext('<html><body>')
                 r += htmltext('<script>window.top.document.fargo_close_dialog();</script>')
                 r += htmltext('</body></html>')
                 return r.getvalue()
             elif 'url' in request.form:
                 # Download file
                 # FIXME: handle error cases
                 url = request.form['url']
                 document = urllib.urlopen(request.form['url']).read()
                 scheme, netloc, path, qs, frag = urlparse.urlsplit(url)
                 path = map(None, path.split('/'))
                 name = urllib.unquote(path[-1])
                 download = qommon.form.PicklableUpload(name, content_type='application/pdf')
                 download.__setstate__({
                     'data': document,
                 })
                 token = get_session().add_tempfile(download)
                 return self.set_token(token, name)
             else:
                 # Display file picker
                 frontoffice_url = get_publisher().get_frontoffice_url()
                 self_url = frontoffice_url
                 self_url += '/fargo/pick'
                 return redirect('%spick?pick=%s' % (self.fargo_url, urllib.quote(self_url)))
         def set_token(self, token, title):
             get_response().add_javascript(['jquery.js'])
             get_response().page_template_key = 'iframe'
             r = TemplateIO(html=True)
             r += htmltext('<html><body>')
             r += htmltext('<script>window.top.document.fargo_set_token(%s, %s);</script>' % (
                 json.dumps(token), json.dumps(title)))
             r += htmltext('</body></html>')
             return r.getvalue()

                 self.max_file_size_bytes = FileSizeWidget.parse_file_size(self.max_file_size)
             self.add(HiddenWidget, 'token')
             if not self.preview:
                 hint = ''
                 if self.allow_portfolio_picking:
                     root_url = get_publisher().get_root_url()
                     if file_validation.has_file_validation() and get_request().user and not self.preview:
                         get_response().add_javascript(['fargo.js'])
                         params = root_url, _('Pick a file from your dropbox'), _('Use file from my dropbox')
                         hint += htmltext('<p class="use-file-from-fargo"><span '
                                          'data-src="%sfargo/pick" '
                                          'data-width="500" '
                                          'data-height="400" '
                                          'data-title="%s" '
                                          'rel="popup">%s</span></p>' % params)
                 hint += self.hint or ''
                 attrs = {'data-url': get_publisher().get_root_url() + 'tmp-upload'}
                 self.file_type = kwargs.pop('file_type', None)
                 if self.file_type:
-...
                 if self.max_file_size_bytes:
                     # this could be used for client size validation of file size
                     attrs['data-max-file-size'] = str(self.max_file_size_bytes)
                 self.add(FileWidget, 'file', render_br=False, attrs=attrs)
                 self.add(FileWidget, 'file', hint=hint, render_br=False, attrs=attrs)
             if self.document_type.get('metadata'):
                 if self.preview:
                     self.add(HiddenWidget, 'validation_url')
-...
                 if not valid_file_type:
                     self.error = _('invalid file type')
         def render_hint(self, hint):
             return ''
     class PicklableUpload(Upload):
         def __getstate__(self):

wcs/qommon/static/css/qommon.css
89	89	margin-right: 2em;
90	90	}
91	91
	92	p.use-file-from-fargo span {
	93	border-bottom: 1px dotted #999;
	94	cursor: pointer;
	95	}
	96
92	97	div.form .title, form.quixote .title {
93	98	font-weight: bold;
94	99	}

wcs/qommon/static/js/fargo.js
46	46	$(base_widget).find('.fileinfo').show();
47	47	$(base_widget).find('input[type=hidden]').val(token);
48	48	$(base_widget).find('input[type=file]').hide();
	49	$(base_widget).find('.use-file-from-fargo').hide();
49	50	}
50	51	document.fargo_close_dialog();
51	52	}

             var base_widget = $(this);
             if ($(base_widget).find('input[type=hidden]').val()) {
                 $(base_widget).find('input[type=file]').hide();
                 $(base_widget).find('.use-file-from-fargo').hide();
             } else {
                 $(base_widget).find('.fileinfo').hide();
+            }
-...
                     enable();
                     $(base_widget).parents('form').find('input[name=submit]').prop('disabled', false);
                     $(this).hide();
                     $(base_widget).find('.use-file-from-fargo').hide();
                 },
                 progress: function (e, data) {
                     var progress = parseInt(data.loaded / data.total * 100, 10);
-...
                 $(base_widget).find('input[name$="$token"]').val('');
                 $(base_widget).find('.fileinfo').hide();
                 $(base_widget).find('input[type=file]').show();
                 $(base_widget).find('.use-file-from-fargo').show();
                 return false;
             });
             $(this).find('a.change').click(function() {

     from myspace import MyspaceDirectory
     from forms.preview import PreviewDirectory
     from wcs import file_validation
     class CompatibilityDirectory(Directory):
         _q_exports = ['']
-...
         _q_exports = ['admin', 'backoffice', 'forms', 'login', 'logout', 'saml',
                 'ident', 'register', 'afterjobs', 'themes', 'myspace', 'user', 'roles',
                 'pages', ('tmp-upload', 'tmp_upload'), 'api', '__version__',
                 'tryauth', 'auth', 'preview', ('reload-top', 'reload_top')]
                 'tryauth', 'auth', 'preview', ('reload-top', 'reload_top'), 'fargo']
         api = ApiDirectory()
         themes = template.ThemesDirectory()
         myspace = MyspaceDirectory()
         pages = qommon.pages.PagesDirectory()
         fargo = file_validation.FargoDirectory()
         def tryauth(self):
             return forms.root.tryauth(get_publisher().get_root_url())
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-do-not-depend-on-auquotidien-to-show-fargo-pick-a-fi.patch