branch develop updated (e6314be -> a6c1d67)
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 e6314be fix new password page new a6c1d67 fix document form validation internal-test #6682 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 a6c1d67722f43f6a4f65f499b5f6c9212d5e6d0e Author: Yannick Martel <martel@©odelutin.com> Date: Wed Feb 18 14:53:42 2015 +0100 fix document form validation internal-test #6682 Summary of changes: coselmar-ui/src/main/webapp/views/documents/editDocument.html | 6 +++--- coselmar-ui/src/main/webapp/views/documents/newdocument.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) -- 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 a6c1d67722f43f6a4f65f499b5f6c9212d5e6d0e Author: Yannick Martel <martel@©odelutin.com> Date: Wed Feb 18 14:53:42 2015 +0100 fix document form validation internal-test #6682 --- coselmar-ui/src/main/webapp/views/documents/editDocument.html | 6 +++--- coselmar-ui/src/main/webapp/views/documents/newdocument.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 27faa77..8ebbfd8 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -129,8 +129,8 @@ <!-- Line with Data : file or External URL --> <div class="form-group" - ng-class="{'has-error' : !document.externalUrl - && !documentForm.externalUrl.$pristine && !document.fileName}"> + ng-class="{'has-error' : !document.externalUrl && !document.fileName + && (!documentForm.externalUrl.$pristine || hasErrors) }"> <div> <label class="col-md-2 control-label">{{ 'document.metadata.file' | translate }}</label> @@ -289,7 +289,7 @@ </div> <div> - <div ng-if="documentForm.$invalid" class="has-error"> + <div ng-if="documentForm.$invalid || hasErrors" class="has-error"> <div class="text-center help-block">{{ 'common.message.missingMandatoryFields' | translate }}</div> </div> <div class="actions"> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index cb836cd..3033fb9 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -138,7 +138,7 @@ <!-- Line with Data : file or External URL --> <div class="form-group" - ng-class="{'has-error' : documentForm.externalUrl.$invalid + ng-class="{'has-error' : !document.externalUrl && !documentForm.externalUrl.$pristine && !upload.file}"> <div> @@ -160,7 +160,7 @@ </div> </div> - <p ng-show="!document.externalUrl && !file.upload" + <p ng-show="!document.externalUrl && !upload.file" class="help-block text-center clear">{{ 'document.message.requiredExternalUrlOrFile' | translate }}</p> </div> @@ -284,7 +284,7 @@ <div class="form-group actions" ng-if="privacy != 'RESTRICTED'"> <input type="submit" value="Submit" class="btn btn-action" - ng-disabled="documentForm.$invalid || keywordsError"/> + ng-disabled="documentForm.$invalid || keywordsError || (!document.externalUrl && !file.upload)"/> </div> </form> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm