Jeroen Hoffman pushed to branch master at cms-community / hippo-essentials
Commits: 996cb58d by Jasper Floor at 2017-11-27T16:41:53+01:00 ESSENTIALS-1106 disbale behavior and remove suggestion - - - - - 57b6dfc7 by Jasper Floor at 2017-11-27T16:42:50+01:00 ESSENTIALS-1106 copyright - - - - - c49fb4fb by Jasper Floor at 2017-11-27T16:52:41+01:00 ESSENTIALS-1106 disable input in not checked - - - - - 0b5d4f6b by Jeroen Hoffman at 2018-01-08T10:20:36+01:00 ESSENTIALS-1106 Merge branch 'master' into feature/ESSENTIALS-1106 - - - - - c50e92e0 by Jeroen Hoffman at 2018-01-08T11:51:08+01:00 ESSENTIALS-1106 put back the placeholder=10, but with always required. Also add reg exp pattern so there must be a 1 or 2 digit value. - - - - - 40190f3e by Jeroen Hoffman at 2018-01-08T11:58:26+01:00 ESSENTIALS-1106 Reintegrate branch 'feature/ESSENTIALS-1106' into master - - - - - 1 changed file: - plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html Changes: ===================================== plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html ===================================== --- a/plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html +++ b/plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html @@ -1,5 +1,5 @@ <!-- - Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com) + Copyright 2014-2017 Hippo B.V. (http://www.onehippo.com) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ </td> <td>{{doc.name}}</td> <td> - <input type="text" ng-model="doc.searchPaths" ng-required="doc.checked" name="searchPaths"/> + <input type="text" ng-model="doc.searchPaths" ng-required="doc.checked" name="searchPaths" ng-disabled="!doc.checked"/> <essentials-folder-picker button-text="Select search folder" title="Select search folder" selected-path="doc.searchPaths" @@ -47,7 +47,8 @@ end-point="{{endpoint}}"/> </td> <td> - <input type="text" ng-model="doc.numberOfSuggestions" ng-required="doc.checked" name="numberOfSuggestions" placeholder="10"/> + <input type="text" ng-model="doc.numberOfSuggestions" ng-required="true" ng-pattern="/^[\d]{1,2}$/" + name="numberOfSuggestions" ng-disabled="!doc.checked" placeholder="10"/> </td> <td> <essentials-cms-document-type-deep-link @@ -70,7 +71,7 @@ </div> <div class="panel-footer"> <div class="pull-right"> - <button ng-disabled="documentsForm.$invalid" class="btn btn-primary" ng-click="addDocs()">Add related documents</button> + <button ng-disabled="documentsForm.$invalid || documentsForm.$pristine" class="btn btn-primary" ng-click="addDocs()">Add related documents</button> </div> <p class="clearfix"> </p> </div> View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/4d6d543772d93a08114fcedf8cbcbbd002a2af5d...40190f3e6d9434b2fd153e7cb2860885aa28662d --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/4d6d543772d93a08114fcedf8cbcbbd002a2af5d...40190f3e6d9434b2fd153e7cb2860885aa28662d You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
