branch develop updated (5e98e08 -> d5c3f2d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git from 5e98e08 code cleanup new d5c3f2d refs #9206 MAnage new errors with externalURL The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d5c3f2d4a1a023c4c33ec99cb2619767a5abb505 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jun 12 10:53:55 2017 +0200 refs #9206 MAnage new errors with externalURL Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/views/admin/admintools.html | 8 ++++++++ 3 files changed, 10 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit d5c3f2d4a1a023c4c33ec99cb2619767a5abb505 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jun 12 10:53:55 2017 +0200 refs #9206 MAnage new errors with externalURL --- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/views/admin/admintools.html | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 42b8814..a81e34f 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -329,6 +329,7 @@ var translateEN = { "admin.tools.message.massimport.csvReadFail" : "Unable to read 'description.csv' file, please verify file format.", "admin.tools.message.massimport.fileReadFail" : "Unable to read some files from zip.", "admin.tools.message.massimport.missingFiles" : "Files not found from zip : ", +"admin.tools.message.massimport.missingAttachments" : "Some documents has no file and no external URL, at least one is mandatory : ", "admin.tools.presentation.luceneRefresh" : "<p>Search Index makes search easier and faster.</p>\ <p>Refresh it guaranties to be weel synch with information from database.</p>", "admin.tools.presentation.documentsimport" : "<p>Documents Mass Import is a functionality reserved to Admin and available inside 'Admin' menu entry.</p>\ diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 28e87fb..e8841b2 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -329,6 +329,7 @@ var translateFR = { "admin.tools.message.massimport.csvReadFail" : "Erreur dans le traitement du fichier 'description.csv'. Veuillez vérifier le format des données.", "admin.tools.message.massimport.fileReadFail" : "Erreur dans le traitement de fichiers contenus dans le zip.", "admin.tools.message.massimport.missingFiles" : "Fichiers non retrouvés dans le zip : ", +"admin.tools.message.massimport.missingAttachments" : "Des documents n'ont ni fichier ni URL externe, au moins l'un des deux est obligatoire : ", "admin.tools.presentation.luceneRefresh" : "<p>L'index de recherche permet d'accélérer la fonctionnalité de recherche.</p>\ <p>Le rafraîchissement de cet index permet d'assurer la bonne synchronisation avec les informations\ stockées en base de données.</p>", diff --git a/coselmar-ui/src/main/webapp/views/admin/admintools.html b/coselmar-ui/src/main/webapp/views/admin/admintools.html index b58922f..d5ada80 100644 --- a/coselmar-ui/src/main/webapp/views/admin/admintools.html +++ b/coselmar-ui/src/main/webapp/views/admin/admintools.html @@ -111,6 +111,14 @@ <li ng-repeat="missingFile in status.importResult.missingFiles">{{missingFile}}</li> </ul> </div> + <!-- Missing files in Zip --> + <div ng-show="status.importResult && status.importResult.documentsWithoutAttachment && status.importResult.documentsWithoutAttachment.length > 0"> + {{ 'admin.tools.message.massimport.missingAttachments' | translate }} + <ul> + <li ng-repeat="documentName in status.importResult.documentsWithoutAttachment">{{documentName}}</li> + </ul> + </div> + </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm