beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed signin validation bug

Browse source
This commit is contained in:
David Baldwynn 2017-11-02 09:54:14 -07:00
parent b2f2599fa5
commit 22875abab5
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public/modules/forms/admin/css/edit-form-configure.css
View file

@ -11,6 +11,7 @@
white-space: nowrap;
vertical-align: middle;
cursor: pointer !important;
pointer-events: none;
}
.email-subject.ta-root .ta-editor.ta-html, .email-subject .ta-scroll-window.form-control {

1
public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html
View file

@ -70,6 +70,7 @@
<div class="col-sm-12 field-input">
<text-angular class="email-subject" ng-model="myform.respondentNotifications.htmlTemplate" ta-toolbar="[['bold','italics', 'insertField']]"></text-angular>
<div ng-bind="myform.respondentNotifications.htmlTemplate"></div>
</div>
</div>
</div>

2
public/modules/forms/config/forms.client.config.js
View file

@ -70,7 +70,7 @@ angular.module('forms').run(['Menus',
</ul>\
</div>',
onClickField: function(field_id, field_name){
this.$editor().wrapSelection('insertHTML', '<var class="tag" contenteditable="false" id="field:' + field_id + '">' + field_name + '</var>', true);
this.$editor().wrapSelection('insertHTML', '<var class="tag" contenteditable="false" ta-readonly="true" id="field:' + field_id + '">' + field_name + '</var>', false);
},
action: function(){
}

4
public/modules/users/controllers/authentication.client.controller.js
View file

@ -9,7 +9,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
$scope.forms = {};
$scope.signin = function() {
if($scope.forms && $scope.forms.hasOwnProperty('siginForm') && !$scope.forms.signinForm.$invalid){
if($scope.forms && $scope.forms.signinForm.$valid){
User.login($scope.credentials).then(
function(response) {
Auth.login(response);
@ -38,7 +38,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
return;
}
if(!$scope.forms.signupForm.$invalid){
if($scope.forms && $scope.forms.signupForm.$valid){
User.signup($scope.credentials).then(
function(response) {
$state.go('signup-success');