Merge branch 'one_apply' of https://github.com/marc1006/wekan into marc1006-one_apply

client/components/users/userHeader.jade

@@ -112,13 +112,11 @@ template(name="changeSettingsPopup")
           i.fa.fa-check
     unless currentUser.isWorker
       li
-        label.bold
+        label.bold.clear
           i.fa.fa-sort-numeric-asc
           | {{_ 'show-cards-minimum-count'}}
         input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false")
-        input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}")
-      li
-        label.bold
+        label.bold.clear
           i.fa.fa-calendar
           | {{_ 'start-day-of-week'}}
         select#start-day-of-week.inline-input.left
@@ -127,7 +125,7 @@ template(name="changeSettingsPopup")
               option(selected="true", value="#{day.value}") #{day.name}
             else
               option(value="#{day.value}") #{day.name}
-        input.js-apply-start-day-of-week.left(type="submit" value="{{_ 'apply'}}")
+        input.js-apply-user-settings.left(type="submit" value="{{_ 'apply'}}")
 
 template(name="userDeletePopup")
   unless currentUser.isWorker

client/components/users/userHeader.js

@@ -268,36 +268,31 @@ Template.changeSettingsPopup.events({
       cookies.set('hasHiddenSystemMessages', 'true');
     }
   },
-  'click .js-apply-show-cards-at'(event, templateInstance) {
+  'click .js-apply-user-settings'(event, templateInstance) {
     event.preventDefault();
     const minLimit = parseInt(
       templateInstance.$('#show-cards-count-at').val(),
       10,
     );
+    const startDay = parseInt(
+      templateInstance.$('#start-day-of-week').val(),
+      10,
+    );
+    const currentUser = Meteor.user();
     if (!isNaN(minLimit)) {
-      currentUser = Meteor.user();
       if (currentUser) {
         Meteor.call('changeLimitToShowCardsCount', minLimit);
       } else {
         cookies.set('limitToShowCardsCount', minLimit);
       }
-      Popup.back();
     }
-  },
-  'click .js-apply-start-day-of-week'(event, templateInstance) {
-    event.preventDefault();
-    const startDay = parseInt(
-      templateInstance.$('#start-day-of-week').val(),
-      10,
-    );
     if (!isNaN(startDay)) {
-      currentUser = Meteor.user();
       if (currentUser) {
         Meteor.call('changeStartDayOfWeek', startDay);
       } else {
         cookies.set('startDayOfWeek', startDay);
       }
-      Popup.back();
     }
+    Popup.back();
   },
 });