branch develop updated (cd6fc2f -> 194cc6b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from cd6fc2f fix migration script for citation, as text for pg new 194cc6b fixes #7913 notify document cannot be modified instead of just no display button 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 194cc6be00a357d723d574c929ecd15fefcd02e7 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 19 12:18:20 2016 +0100 fixes #7913 notify document cannot be modified instead of just no display button 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/documents/viewDocument.html | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) -- 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 http://git.codelutin.com/coselmar.git commit 194cc6be00a357d723d574c929ecd15fefcd02e7 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 19 12:18:20 2016 +0100 fixes #7913 notify document cannot be modified instead of just no display button --- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/views/documents/viewDocument.html | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 7751f48..d465081 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -127,6 +127,7 @@ var translateEN = { <li>Restricted : you, the defined experts and members of project using this document</li>\ </ul>", "document.message.info.keywords" : "Keywords enable to classify document and make search easier. Each input keyword should be validated with button \"Add\".", +"document.message.info.referredInProjects" : "Document is referred by projects and so cannot be modified.", "document.button.download" : "Download", "document.button.openLink" : "Open link", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 8f2904d..e689c44 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -127,6 +127,7 @@ var translateFR = { <li>Restreint : vous, les experts selectionnés et les membres des projets utilisant le document.</li>\ </ul>", "document.message.info.keywords" : "Les mots-clefs permettent de classifier le projet et faciliter sa recherche. Chaque mot-clef saisi doit être validé avec le bouton \"Ajouter\".", +"document.message.info.referredInProjects" : "Le document est référencé par des projets et ne peut donc être modifié.", "document.button.download" : "Télécharger", "document.button.openLink" : "Ouvrir le lien", diff --git a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html index 47c5453..63529f1 100644 --- a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html @@ -148,7 +148,7 @@ </div> <div class="actions"> - <a class="btn btn-action btn-edit" ng-click="edit()" ng-if="editSession != true && canEdit"> + <a class="btn btn-action btn-edit" ng-click="edit()" ng-if="editSession != true" ng-disabled="!canEdit"> <span class="fa fa-edit" aria-hidden="true"></span>{{ 'common.button.edit' | translate }} </a> <a href="{{container.baseUrl}}/documents/{{document.id}}/file" class="btn btn-action btn-success" ng-if="document.withFile"> @@ -163,4 +163,7 @@ <span class="fa fa-remove" aria-hidden="true"></span>{{ 'common.button.delete' | translate }} </a> </div> + <div ng-if="!canEdit" class="actions"> + {{ 'document.message.info.referredInProjects' | translate }} + </div> </div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm