Document edit form

	Type	Name
- -	Content name
+ +	Content name	- +	- +

+ + \ No newline at end of file -- 2.20.1 From a8d9cafde69dd2360870cc971f8e7393c4f5a0de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Wed, 4 Dec 2013 20:37:03 +0100 Subject: [PATCH 12/16] =?utf8?q?noms=20de=20fichiers=20encod=C3=A9s.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Folder.py | 4 ++-- skins/ajax_scripts/fileupload.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Folder.py b/Folder.py index b762702..4db6725 100644 --- a/Folder.py +++ b/Folder.py @@ -31,6 +31,7 @@ from zExceptions import Unauthorized import sys import warnings from cgi import escape +from urllib import unquote from OFS import Moniker from ZODB.POSException import ConflictError import OFS.subscribers @@ -297,8 +298,7 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : """ self.dav__init(REQUEST, RESPONSE) - - fileName = REQUEST.getHeader('X-File-Name', '') + fileName = unquote(REQUEST.getHeader('X-File-Name', '')) validId = makeValidId(self, fileName, allow_dup=True) ifhdr = REQUEST.get_header('If', '') diff --git a/skins/ajax_scripts/fileupload.js b/skins/ajax_scripts/fileupload.js index bf36628..675ff13 100644 --- a/skins/ajax_scripts/fileupload.js +++ b/skins/ajax_scripts/fileupload.js @@ -68,7 +68,7 @@ DDFileUploaderBase.prototype.upload = function(item) { req.open("PUT", this.uploadUrl); req.setRequestHeader("Content-Type", file.type); - req.setRequestHeader("X-File-Name", file.name); + req.setRequestHeader("X-File-Name", encodeURI(file.name)); addListener(reader, 'load', function(evt){ try { -- 2.20.1 From 326a6677709320dc5149de76f6ae2bdea31fe4fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Wed, 4 Dec 2013 21:07:15 +0100 Subject: [PATCH 13/16] =?utf8?q?Dans=20le=20cas=20(courant)=20o=C3=B9=20l?= =?utf8?q?=E2=80=99objet=20cr=C3=A9=C3=A9=20impl=C3=A9mente=20DublinCore,?= =?utf8?q?=20alors=20on=20initialise=20le=20titre=20avec=20le=20nom=20du?= =?utf8?q?=20fichier=20original=20et=20le=20format=20(content-type).?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Folder.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Folder.py b/Folder.py index 4db6725..8691fcf 100644 --- a/Folder.py +++ b/Folder.py @@ -58,6 +58,7 @@ from Products.CMFCore.utils import _checkPermission, getToolByName from Products.CMFCore.utils import getUtilityByInterfaceName from Products.CMFCore.CMFCatalogAware import CMFCatalogAware from Products.CMFCore.PortalFolder import PortalFolder, ContentFilter +from Products.CMFCore.interfaces import IDublinCore from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl from zope.interface import implements @@ -325,6 +326,9 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : ob = self.PUT_factory(validId, typ, body) self._setObject(validId, ob) ob = self._getOb(validId) + if IDublinCore.providedBy(ob) : + ob.editMetadata(title=fileName, + format=typ) httpRespCode = 201 else : httpRespCode = 200 -- 2.20.1 From 61413cff15e2ca1a1b698c5b82973d1713997225 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Wed, 4 Dec 2013 23:32:09 +0100 Subject: [PATCH 14/16] Retrait print de debug. --- File.py | 1 - 1 file changed, 1 deletion(-) diff --git a/File.py b/File.py index dfb22c4..22a1101 100755 --- a/File.py +++ b/File.py @@ -101,7 +101,6 @@ class File(BlobFile, CMFFile) : if orig_name : self.orig_name = orig_name - print self.absolute_url(), self.Format() if self.Format() == 'application/x-shockwave-flash' : if file : try : -- 2.20.1 From 522ae82bd3a30e30ed50c444fd93164479a8e051 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Wed, 4 Dec 2013 23:32:56 +0100 Subject: [PATCH 15/16] =?utf8?q?Ajout=20barre=20de=20progression=20de=20l?= =?utf8?q?=E2=80=99upload=20du=20fichier=20courant.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- skins/ajax_scripts/folder_contents_script.js | 26 +++++++++++++++----- skins/custom_generic/zpt_stylesheet.css.dtml | 13 +++++++++- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/skins/ajax_scripts/folder_contents_script.js b/skins/ajax_scripts/folder_contents_script.js index 7204a4e..d427939 100644 --- a/skins/ajax_scripts/folder_contents_script.js +++ b/skins/ajax_scripts/folder_contents_script.js @@ -244,6 +244,7 @@ loadListing = function(evt) { DDFolderUploader = function(dropbox, uploadUrl, listing) { DDFileUploaderBase.apply(this, [dropbox, uploadUrl]); this.listing = listing; + this.progressBarMaxSize = listing.clientWidth; var thead = listing; do { thead = thead.previousSibling; @@ -273,9 +274,19 @@ DDFolderUploader.prototype.createRow = function(file) { this.lastRowClassName = row.className; var td = document.createElement('td'); td.setAttribute('colspan', this.tableSpan); - td.innerHTML = file.name; + var relSpan = document.createElement('span'); + relSpan.style.position = 'relative'; + td.appendChild(relSpan); + var progressBar = document.createElement('span'); + progressBar.className = 'upload-progress'; + row.progressBar = progressBar; + relSpan.appendChild(progressBar); + var fileNameSpan = document.createElement('span'); + fileNameSpan.innerHTML = file.name; + td.appendChild(fileNameSpan); row.appendChild(td); this.listing.appendChild(row); + this.progressBarMaxSize = row.clientWidth; return row; }; @@ -290,28 +301,31 @@ DDFolderUploader.prototype.handleFiles = function(files) { }; DDFolderUploader.prototype.beforeUpload = function(item) { - this.uploadedItem = item; - // To be implemented by decendant. + this.uploadedItem = item; + this.progressBar = item.progressBar; }; DDFolderUploader.prototype.uploadCompleteHandlerCB = function(req) { var item = this.uploadedItem; var row = getCopyOfNode(req.responseXML.documentElement.firstChild); - row.className = item.className; + row.className = item.className; if (req.status === 200) { // update - console.log('todo'); + console.log('todo'); } else if(req.status === 201) { // creation this.listing.replaceChild(row, item); + this.progressBarMaxSize = row.clientWidth; } }; DDFolderUploader.prototype.progressHandlerCB = function(progress) { - // To be implemented by descendant. // 0 <= progress <= 1 + var size = this.progressBarMaxSize * progress; + size = Math.round(size); + this.progressBar.style.width = size + 'px'; }; }()); \ No newline at end of file diff --git a/skins/custom_generic/zpt_stylesheet.css.dtml b/skins/custom_generic/zpt_stylesheet.css.dtml index 8acbdab..77011e0 100644 --- a/skins/custom_generic/zpt_stylesheet.css.dtml +++ b/skins/custom_generic/zpt_stylesheet.css.dtml @@ -390,7 +390,18 @@ textarea { } .listing .even { background-color: &dtml-evenRowBackgroundColor;; -} +} + +.listing span.upload-progress { + display: block; + position:absolute; + background:#ef8e32; + height:4px; + border-radius:2px; + width:0; + top:3px; +} + /* Batched navigation */ -- 2.20.1 From dcb4d334efa90367fc247c73be69590b50260143 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Wed, 4 Dec 2013 23:53:36 +0100 Subject: [PATCH 16/16] =?utf8?q?Si=20la=20cr=C3=A9ation=20du=20type=20adoc?= =?utf8?q?=20n=E2=80=99est=20pas=20possible=20(pas=20autoris=C3=A9e)=20on?= =?utf8?q?=20cr=C3=A9e=20alors=20un=20fichier=20en=20recours.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Folder.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Folder.py b/Folder.py index 8691fcf..05b7129 100644 --- a/Folder.py +++ b/Folder.py @@ -323,9 +323,13 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : typ, enc=guess_content_type(validId, body) if self.checkIdAvailable(validId) : - ob = self.PUT_factory(validId, typ, body) - self._setObject(validId, ob) - ob = self._getOb(validId) + try : + ob = self.PUT_factory(validId, typ, body) + self._setObject(validId, ob) + ob = self._getOb(validId) + except ValueError : # maybe "Disallowed subobject type". Fallback to file type. + validId = self.invokeFactory('File', validId) + ob = self._getOb(validId) if IDublinCore.providedBy(ob) : ob.editMetadata(title=fileName, format=typ) -- 2.20.1