From 2bf004120d5a43cd3c3c060fc7c0c30d1b01f220 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Fri, 3 Jan 2020 06:49:35 +0200
Subject: Add Worker role. Add more Font Awesome icons. Fix browser console
 errors when editing user profile name etc.

Thanks to xet7 !

Closes #2788
---
 client/components/settings/informationBody.jade |  8 ++++++--
 client/components/settings/peopleBody.jade      | 13 ++++++++++---
 client/components/settings/peopleBody.styl      |  2 +-
 client/components/settings/settingBody.jade     | 25 +++++++++++++++++++------
 client/components/settings/settingBody.styl     |  5 ++++-
 5 files changed, 40 insertions(+), 13 deletions(-)

(limited to 'client/components/settings')

diff --git a/client/components/settings/informationBody.jade b/client/components/settings/informationBody.jade
index 2c615ffd..0f85dd9c 100644
--- a/client/components/settings/informationBody.jade
+++ b/client/components/settings/informationBody.jade
@@ -4,12 +4,16 @@ template(name='information')
       | {{_ 'error-notAuthorized'}}
     else
       .content-title
-        span {{_ 'info'}}
+        span
+          i.fa.fa-info-circle
+          | {{_ 'info'}}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="information-display") {{_ 'info'}}
+              a.js-setting-menu(data-id="information-display")
+                i.fa.fa-info-circle
+                | {{_ 'info'}}
         .main-body
           +statistics
 
diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade
index d8f672b0..b8a94337 100644
--- a/client/components/settings/peopleBody.jade
+++ b/client/components/settings/peopleBody.jade
@@ -5,16 +5,22 @@ template(name="people")
     else
       .content-title.ext-box
         .ext-box-left
-          span {{_ 'people'}}
+          span
+            i.fa.fa-users
+            | {{_ 'people'}}
           input#searchInput(placeholder="{{_ 'search'}}")
-          button#searchButton {{_ 'search'}}
+          button#searchButton
+            i.fa.fa-search
+            | {{_ 'search'}}
         .ext-box-right
           span {{_ 'people-number'}} #{peopleNumber}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="people-setting") {{_ 'people'}}
+              a.js-setting-menu(data-id="people-setting")
+                i.fa.fa-users
+                | {{_ 'people'}}
         .main-body
           if loading.get
             +spinner
@@ -90,6 +96,7 @@ template(name="peopleRow")
       td {{_ userData.authenticationMethod }}
     td
       a.edit-user
+        i.fa.fa-edit
         | {{_ 'edit'}}
 
 template(name="editUserPopup")
diff --git a/client/components/settings/peopleBody.styl b/client/components/settings/peopleBody.styl
index 80387611..c223e181 100644
--- a/client/components/settings/peopleBody.styl
+++ b/client/components/settings/peopleBody.styl
@@ -33,7 +33,7 @@ table
     padding: 0;
 
   button
-    min-width: 60px;
+    min-width: 90px;
 
 .content-wrapper
   margin-top: 10px
diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade
index 04b635e8..877fe6e2 100644
--- a/client/components/settings/settingBody.jade
+++ b/client/components/settings/settingBody.jade
@@ -4,22 +4,35 @@ template(name="setting")
       | {{_ 'error-notAuthorized'}}
     else
       .content-title
+        i.fa.fa-cog
         span {{_ 'settings'}}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="registration-setting") {{_ 'registration'}}
+              a.js-setting-menu(data-id="registration-setting")
+                i.fa.fa-sign-in
+                | {{_ 'registration'}}
             li
-              a.js-setting-menu(data-id="email-setting") {{_ 'email'}}
+              a.js-setting-menu(data-id="email-setting")
+                i.fa.fa-envelope
+                | {{_ 'email'}}
             li
-              a.js-setting-menu(data-id="account-setting") {{_ 'accounts'}}
+              a.js-setting-menu(data-id="account-setting")
+                i.fa.fa-users
+                | {{_ 'accounts'}}
             li
-              a.js-setting-menu(data-id="announcement-setting") {{_ 'admin-announcement'}}
+              a.js-setting-menu(data-id="announcement-setting")
+                i.fa.fa-bullhorn
+                | {{_ 'admin-announcement'}}
             li
-              a.js-setting-menu(data-id="layout-setting") {{_ 'layout'}}
+              a.js-setting-menu(data-id="layout-setting")
+                i.fa.fa-object-group
+                | {{_ 'layout'}}
             li
-              a.js-setting-menu(data-id="webhook-setting") {{_ 'global-webhook'}}
+              a.js-setting-menu(data-id="webhook-setting")
+                i.fa.fa-globe
+                | {{_ 'global-webhook'}}
         .main-body
           if loading.get
             +spinner
diff --git a/client/components/settings/settingBody.styl b/client/components/settings/settingBody.styl
index bcbd2ea1..d6ac32b2 100644
--- a/client/components/settings/settingBody.styl
+++ b/client/components/settings/settingBody.styl
@@ -41,15 +41,18 @@
           &:hover
             background #fff
             box-shadow 0 1px 2px rgba(0,0,0,0.15);
+
           a
             @extends .flex
             padding: 1rem 0 1rem 1rem
             width: 100% - 5rem
 
-
             span
               font-size: 13px
 
+            i
+              margin-right: 20px
+
     .main-body
       padding: 0.1em 1em
       -webkit-user-select: text // Safari 3.1+
-- 
cgit v1.2.3-1-g7c22


From 27943796ade78ca3c503637a1340918bf06a1267 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Fri, 3 Jan 2020 16:02:31 +0200
Subject: Revert to Wekan v3.57 version of client and models directories,
 removing Worker role temporarily, because Worker role changes broke saving
 card.

Thanks to xet7 !
---
 client/components/settings/informationBody.jade |  8 ++------
 client/components/settings/peopleBody.jade      | 13 +++----------
 client/components/settings/peopleBody.styl      |  2 +-
 client/components/settings/settingBody.jade     | 25 ++++++-------------------
 client/components/settings/settingBody.styl     |  5 +----
 5 files changed, 13 insertions(+), 40 deletions(-)

(limited to 'client/components/settings')

diff --git a/client/components/settings/informationBody.jade b/client/components/settings/informationBody.jade
index 0f85dd9c..2c615ffd 100644
--- a/client/components/settings/informationBody.jade
+++ b/client/components/settings/informationBody.jade
@@ -4,16 +4,12 @@ template(name='information')
       | {{_ 'error-notAuthorized'}}
     else
       .content-title
-        span
-          i.fa.fa-info-circle
-          | {{_ 'info'}}
+        span {{_ 'info'}}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="information-display")
-                i.fa.fa-info-circle
-                | {{_ 'info'}}
+              a.js-setting-menu(data-id="information-display") {{_ 'info'}}
         .main-body
           +statistics
 
diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade
index b8a94337..d8f672b0 100644
--- a/client/components/settings/peopleBody.jade
+++ b/client/components/settings/peopleBody.jade
@@ -5,22 +5,16 @@ template(name="people")
     else
       .content-title.ext-box
         .ext-box-left
-          span
-            i.fa.fa-users
-            | {{_ 'people'}}
+          span {{_ 'people'}}
           input#searchInput(placeholder="{{_ 'search'}}")
-          button#searchButton
-            i.fa.fa-search
-            | {{_ 'search'}}
+          button#searchButton {{_ 'search'}}
         .ext-box-right
           span {{_ 'people-number'}} #{peopleNumber}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="people-setting")
-                i.fa.fa-users
-                | {{_ 'people'}}
+              a.js-setting-menu(data-id="people-setting") {{_ 'people'}}
         .main-body
           if loading.get
             +spinner
@@ -96,7 +90,6 @@ template(name="peopleRow")
       td {{_ userData.authenticationMethod }}
     td
       a.edit-user
-        i.fa.fa-edit
         | {{_ 'edit'}}
 
 template(name="editUserPopup")
diff --git a/client/components/settings/peopleBody.styl b/client/components/settings/peopleBody.styl
index c223e181..80387611 100644
--- a/client/components/settings/peopleBody.styl
+++ b/client/components/settings/peopleBody.styl
@@ -33,7 +33,7 @@ table
     padding: 0;
 
   button
-    min-width: 90px;
+    min-width: 60px;
 
 .content-wrapper
   margin-top: 10px
diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade
index 877fe6e2..04b635e8 100644
--- a/client/components/settings/settingBody.jade
+++ b/client/components/settings/settingBody.jade
@@ -4,35 +4,22 @@ template(name="setting")
       | {{_ 'error-notAuthorized'}}
     else
       .content-title
-        i.fa.fa-cog
         span {{_ 'settings'}}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="registration-setting")
-                i.fa.fa-sign-in
-                | {{_ 'registration'}}
+              a.js-setting-menu(data-id="registration-setting") {{_ 'registration'}}
             li
-              a.js-setting-menu(data-id="email-setting")
-                i.fa.fa-envelope
-                | {{_ 'email'}}
+              a.js-setting-menu(data-id="email-setting") {{_ 'email'}}
             li
-              a.js-setting-menu(data-id="account-setting")
-                i.fa.fa-users
-                | {{_ 'accounts'}}
+              a.js-setting-menu(data-id="account-setting") {{_ 'accounts'}}
             li
-              a.js-setting-menu(data-id="announcement-setting")
-                i.fa.fa-bullhorn
-                | {{_ 'admin-announcement'}}
+              a.js-setting-menu(data-id="announcement-setting") {{_ 'admin-announcement'}}
             li
-              a.js-setting-menu(data-id="layout-setting")
-                i.fa.fa-object-group
-                | {{_ 'layout'}}
+              a.js-setting-menu(data-id="layout-setting") {{_ 'layout'}}
             li
-              a.js-setting-menu(data-id="webhook-setting")
-                i.fa.fa-globe
-                | {{_ 'global-webhook'}}
+              a.js-setting-menu(data-id="webhook-setting") {{_ 'global-webhook'}}
         .main-body
           if loading.get
             +spinner
diff --git a/client/components/settings/settingBody.styl b/client/components/settings/settingBody.styl
index d6ac32b2..bcbd2ea1 100644
--- a/client/components/settings/settingBody.styl
+++ b/client/components/settings/settingBody.styl
@@ -41,18 +41,15 @@
           &:hover
             background #fff
             box-shadow 0 1px 2px rgba(0,0,0,0.15);
-
           a
             @extends .flex
             padding: 1rem 0 1rem 1rem
             width: 100% - 5rem
 
+
             span
               font-size: 13px
 
-            i
-              margin-right: 20px
-
     .main-body
       padding: 0.1em 1em
       -webkit-user-select: text // Safari 3.1+
-- 
cgit v1.2.3-1-g7c22


From cd253522a305523e3e36bb73313e8c4db500a717 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Fri, 3 Jan 2020 17:02:27 +0200
Subject: Add more Font Awesome icons. This was originally added at Wekan
 v3.58, removed at Wekan v3.60, and now added back at Wekan v3.61.

Thanks to xet7 !
---
 client/components/settings/informationBody.jade |  8 ++++++--
 client/components/settings/peopleBody.jade      | 13 ++++++++++---
 client/components/settings/peopleBody.styl      |  2 +-
 client/components/settings/settingBody.jade     | 25 +++++++++++++++++++------
 client/components/settings/settingBody.styl     |  5 ++++-
 5 files changed, 40 insertions(+), 13 deletions(-)

(limited to 'client/components/settings')

diff --git a/client/components/settings/informationBody.jade b/client/components/settings/informationBody.jade
index 2c615ffd..0f85dd9c 100644
--- a/client/components/settings/informationBody.jade
+++ b/client/components/settings/informationBody.jade
@@ -4,12 +4,16 @@ template(name='information')
       | {{_ 'error-notAuthorized'}}
     else
       .content-title
-        span {{_ 'info'}}
+        span
+          i.fa.fa-info-circle
+          | {{_ 'info'}}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="information-display") {{_ 'info'}}
+              a.js-setting-menu(data-id="information-display")
+                i.fa.fa-info-circle
+                | {{_ 'info'}}
         .main-body
           +statistics
 
diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade
index d8f672b0..b8a94337 100644
--- a/client/components/settings/peopleBody.jade
+++ b/client/components/settings/peopleBody.jade
@@ -5,16 +5,22 @@ template(name="people")
     else
       .content-title.ext-box
         .ext-box-left
-          span {{_ 'people'}}
+          span
+            i.fa.fa-users
+            | {{_ 'people'}}
           input#searchInput(placeholder="{{_ 'search'}}")
-          button#searchButton {{_ 'search'}}
+          button#searchButton
+            i.fa.fa-search
+            | {{_ 'search'}}
         .ext-box-right
           span {{_ 'people-number'}} #{peopleNumber}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="people-setting") {{_ 'people'}}
+              a.js-setting-menu(data-id="people-setting")
+                i.fa.fa-users
+                | {{_ 'people'}}
         .main-body
           if loading.get
             +spinner
@@ -90,6 +96,7 @@ template(name="peopleRow")
       td {{_ userData.authenticationMethod }}
     td
       a.edit-user
+        i.fa.fa-edit
         | {{_ 'edit'}}
 
 template(name="editUserPopup")
diff --git a/client/components/settings/peopleBody.styl b/client/components/settings/peopleBody.styl
index 80387611..c223e181 100644
--- a/client/components/settings/peopleBody.styl
+++ b/client/components/settings/peopleBody.styl
@@ -33,7 +33,7 @@ table
     padding: 0;
 
   button
-    min-width: 60px;
+    min-width: 90px;
 
 .content-wrapper
   margin-top: 10px
diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade
index 04b635e8..877fe6e2 100644
--- a/client/components/settings/settingBody.jade
+++ b/client/components/settings/settingBody.jade
@@ -4,22 +4,35 @@ template(name="setting")
       | {{_ 'error-notAuthorized'}}
     else
       .content-title
+        i.fa.fa-cog
         span {{_ 'settings'}}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="registration-setting") {{_ 'registration'}}
+              a.js-setting-menu(data-id="registration-setting")
+                i.fa.fa-sign-in
+                | {{_ 'registration'}}
             li
-              a.js-setting-menu(data-id="email-setting") {{_ 'email'}}
+              a.js-setting-menu(data-id="email-setting")
+                i.fa.fa-envelope
+                | {{_ 'email'}}
             li
-              a.js-setting-menu(data-id="account-setting") {{_ 'accounts'}}
+              a.js-setting-menu(data-id="account-setting")
+                i.fa.fa-users
+                | {{_ 'accounts'}}
             li
-              a.js-setting-menu(data-id="announcement-setting") {{_ 'admin-announcement'}}
+              a.js-setting-menu(data-id="announcement-setting")
+                i.fa.fa-bullhorn
+                | {{_ 'admin-announcement'}}
             li
-              a.js-setting-menu(data-id="layout-setting") {{_ 'layout'}}
+              a.js-setting-menu(data-id="layout-setting")
+                i.fa.fa-object-group
+                | {{_ 'layout'}}
             li
-              a.js-setting-menu(data-id="webhook-setting") {{_ 'global-webhook'}}
+              a.js-setting-menu(data-id="webhook-setting")
+                i.fa.fa-globe
+                | {{_ 'global-webhook'}}
         .main-body
           if loading.get
             +spinner
diff --git a/client/components/settings/settingBody.styl b/client/components/settings/settingBody.styl
index bcbd2ea1..d6ac32b2 100644
--- a/client/components/settings/settingBody.styl
+++ b/client/components/settings/settingBody.styl
@@ -41,15 +41,18 @@
           &:hover
             background #fff
             box-shadow 0 1px 2px rgba(0,0,0,0.15);
+
           a
             @extends .flex
             padding: 1rem 0 1rem 1rem
             width: 100% - 5rem
 
-
             span
               font-size: 13px
 
+            i
+              margin-right: 20px
+
     .main-body
       padding: 0.1em 1em
       -webkit-user-select: text // Safari 3.1+
-- 
cgit v1.2.3-1-g7c22


From ddce0ada094e6450be260b4cda21fdfa09ae0133 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Mon, 6 Jan 2020 11:01:38 +0200
Subject: Removed Custom HTML feature that does not work.

Thanks to xet7 !

Closes #2218
---
 client/components/settings/settingBody.jade | 6 ------
 client/components/settings/settingBody.js   | 8 --------
 2 files changed, 14 deletions(-)

(limited to 'client/components/settings')

diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade
index 877fe6e2..835a3b81 100644
--- a/client/components/settings/settingBody.jade
+++ b/client/components/settings/settingBody.jade
@@ -184,12 +184,6 @@ template(name='layoutSettings')
       .title {{_ 'custom-product-name'}}
       .form-group
         input.wekan-form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
-    li.layout-form
-      .title {{_ 'add-custom-html-after-body-start'}}
-      textarea#customHTMLafterBodyStart.wekan-form-control= currentSetting.customHTMLafterBodyStart
-    li.layout-form
-      .title {{_ 'add-custom-html-before-body-end'}}
-      textarea#customHTMLbeforeBodyEnd.wekan-form-control= currentSetting.customHTMLbeforeBodyEnd
     li
       button.js-save-layout.primary {{_ 'save'}}
 
diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js
index 4ff5aedd..319c066b 100644
--- a/client/components/settings/settingBody.js
+++ b/client/components/settings/settingBody.js
@@ -171,20 +171,12 @@ BlazeComponent.extendComponent({
     const displayAuthenticationMethod =
       $('input[name=displayAuthenticationMethod]:checked').val() === 'true';
     const defaultAuthenticationMethod = $('#defaultAuthenticationMethod').val();
-    const customHTMLafterBodyStart = $('#customHTMLafterBodyStart')
-      .val()
-      .trim();
-    const customHTMLbeforeBodyEnd = $('#customHTMLbeforeBodyEnd')
-      .val()
-      .trim();
 
     try {
       Settings.update(Settings.findOne()._id, {
         $set: {
           productName,
           hideLogo: hideLogoChange,
-          customHTMLafterBodyStart,
-          customHTMLbeforeBodyEnd,
           displayAuthenticationMethod,
           defaultAuthenticationMethod,
         },
-- 
cgit v1.2.3-1-g7c22


From e0ca960a35cf006880019ba28fc82aa30f289a71 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Sat, 22 Feb 2020 02:49:14 +0200
Subject: Create New User in Admin Panel. Works, but does not save fullname
 yet, so currently it's needed to edit add fullname later.

Thanks to xet7 !

Related #802
---
 client/components/settings/peopleBody.jade | 52 ++++++++++++++++
 client/components/settings/peopleBody.js   | 95 ++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+)

(limited to 'client/components/settings')

diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade
index b8a94337..ca4bc382 100644
--- a/client/components/settings/peopleBody.jade
+++ b/client/components/settings/peopleBody.jade
@@ -40,9 +40,15 @@ template(name="peopleGeneral")
         th {{_ 'active'}}
         th {{_ 'authentication-method'}}
         th
+          +newUserRow
       each user in peopleList
         +peopleRow(userId=user._id)
 
+template(name="newUserRow")
+  a.new-user
+    i.fa.fa-edit
+    | {{_ 'new'}}
+
 template(name="peopleRow")
   tr
     if userData.loginDisabled
@@ -148,3 +154,49 @@ template(name="editUserPopup")
     //  div
     //  input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")
 
+template(name="newUserPopup")
+  form
+    //label.hide.userId(type="text" value=user._id)
+    label
+      | {{_ 'fullname'}}
+      input.js-profile-fullname(type="text" value="" autofocus)
+    label
+      | {{_ 'username'}}
+      span.error.hide.username-taken
+        | {{_ 'error-username-taken'}}
+      //if isLdap
+      //  input.js-profile-username(type="text" value=user.username readonly)
+      //else
+      input.js-profile-username(type="text" value="")
+    label
+      | {{_ 'email'}}
+      span.error.hide.email-taken
+        | {{_ 'error-email-taken'}}
+      //if isLdap
+      //  input.js-profile-email(type="email" value="{{user.emails.[0].address}}" readonly)
+      //else
+      input.js-profile-email(type="email" value="")
+    label
+      | {{_ 'admin'}}
+      select.select-role.js-profile-isadmin
+        option(value="false" selected="selected") {{_ 'no'}}
+        option(value="true") {{_ 'yes'}}
+    label
+      | {{_ 'active'}}
+      select.select-active.js-profile-isactive
+        option(value="false" selected="selected") {{_ 'yes'}}
+        option(value="true") {{_ 'no'}}
+    label
+      | {{_ 'authentication-type'}}
+      select.select-authenticationMethod.js-authenticationMethod
+        each authentications
+          if isSelected value
+            option(value="{{value}}" selected) {{_ value}}
+          else
+            option(value="{{value}}") {{_ value}}
+    hr
+    label
+      | {{_ 'password'}}
+      input.js-profile-password(type="password")
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js
index 8610034e..186afd58 100644
--- a/client/components/settings/peopleBody.js
+++ b/client/components/settings/peopleBody.js
@@ -39,6 +39,9 @@ BlazeComponent.extendComponent({
             this.filterPeople();
           }
         },
+        'click #newUserButton'() {
+          Popup.open('newUser');
+        },
       },
     ];
   },
@@ -141,6 +144,47 @@ Template.editUserPopup.helpers({
   },
 });
 
+Template.newUserPopup.onCreated(function() {
+  this.authenticationMethods = new ReactiveVar([]);
+  this.errorMessage = new ReactiveVar('');
+
+  Meteor.call('getAuthenticationsEnabled', (_, result) => {
+    if (result) {
+      // TODO : add a management of different languages
+      // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
+      this.authenticationMethods.set([
+        { value: 'password' },
+        // Gets only the authentication methods availables
+        ...Object.entries(result)
+          .filter(e => e[1])
+          .map(e => ({ value: e[0] })),
+      ]);
+    }
+  });
+});
+
+Template.newUserPopup.helpers({
+  //user() {
+  //  return Users.findOne(this.userId);
+  //},
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  //isSelected(match) {
+  //  const userId = Template.instance().data.userId;
+  //  const selected = Users.findOne(userId).authenticationMethod;
+  //  return selected === match;
+  //},
+  //isLdap() {
+  //  const userId = Template.instance().data.userId;
+  //  const selected = Users.findOne(userId).authenticationMethod;
+  //  return selected === 'ldap';
+  //},
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
+});
+
 BlazeComponent.extendComponent({
   onCreated() {},
   user() {
@@ -155,6 +199,16 @@ BlazeComponent.extendComponent({
   },
 }).register('peopleRow');
 
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click a.new-user': Popup.open('newUser'),
+      },
+    ];
+  },
+}).register('newUserRow');
+
 Template.editUserPopup.events({
   submit(event, templateInstance) {
     event.preventDefault();
@@ -248,3 +302,44 @@ Template.editUserPopup.events({
     Popup.close();
   }),
 });
+
+Template.newUserPopup.events({
+  submit(event, templateInstance) {
+    event.preventDefault();
+    const fullname = templateInstance.find('.js-profile-fullname').value.trim();
+    const username = templateInstance.find('.js-profile-username').value.trim();
+    const password = templateInstance.find('.js-profile-password').value;
+    const isAdmin = templateInstance.find('.js-profile-isadmin').value.trim();
+    const isActive = templateInstance.find('.js-profile-isactive').value.trim();
+    const email = templateInstance.find('.js-profile-email').value.trim();
+
+    Meteor.call(
+      'setCreateUser',
+      fullname,
+      username,
+      password,
+      isAdmin,
+      isActive,
+      email.toLowerCase(),
+      function(error) {
+        const usernameMessageElement = templateInstance.$('.username-taken');
+        const emailMessageElement = templateInstance.$('.email-taken');
+        if (error) {
+          const errorElement = error.error;
+          if (errorElement === 'username-already-taken') {
+            usernameMessageElement.show();
+            emailMessageElement.hide();
+          } else if (errorElement === 'email-already-taken') {
+            usernameMessageElement.hide();
+            emailMessageElement.show();
+          }
+        } else {
+          usernameMessageElement.hide();
+          emailMessageElement.hide();
+          Popup.close();
+        }
+      },
+    );
+    Popup.close();
+  },
+});
-- 
cgit v1.2.3-1-g7c22


From aac7c380c8c389b0683b2bd64e2cc856993f0e30 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Sun, 1 Mar 2020 20:59:53 +0200
Subject: - Fix critical and moderate security vulnerabilities reported at
 2020-02-26 with   responsible disclosure by [Dejan
 Zelic](https://twitter.com/dejandayoff),   Justin Benjamin and others at
 [Offensive Security](https://twitter.com/offsectraining),   that follow
 standard 90 days before public disclosure.   Thanks to xet7. - Fix webhook
 error that prevented some card etc deleting from web UI of board.   Thanks to
 xet7. - Add some more Font Awesome icons.   Thanks to xet7. - Remove
 autofocus from many form input boxes so that they would not cause warnings.  
 Thanks to xet7.

---
 client/components/settings/peopleBody.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'client/components/settings')

diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade
index ca4bc382..fef1067e 100644
--- a/client/components/settings/peopleBody.jade
+++ b/client/components/settings/peopleBody.jade
@@ -110,7 +110,7 @@ template(name="editUserPopup")
     label.hide.userId(type="text" value=user._id)
     label
       | {{_ 'fullname'}}
-      input.js-profile-fullname(type="text" value=user.profile.fullname autofocus)
+      input.js-profile-fullname(type="text" value=user.profile.fullname)
     label
       | {{_ 'username'}}
       span.error.hide.username-taken
@@ -159,7 +159,7 @@ template(name="newUserPopup")
     //label.hide.userId(type="text" value=user._id)
     label
       | {{_ 'fullname'}}
-      input.js-profile-fullname(type="text" value="" autofocus)
+      input.js-profile-fullname(type="text" value="")
     label
       | {{_ 'username'}}
       span.error.hide.username-taken
-- 
cgit v1.2.3-1-g7c22


From 10fcc19b7f9307e71f01b6abca055806d69f7d4e Mon Sep 17 00:00:00 2001
From: boeserwolf <github@noxware.de>
Date: Sun, 19 Apr 2020 12:30:21 +0300
Subject: Add sortDefault helper for sorting boards

---
 client/components/settings/settingBody.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client/components/settings')

diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js
index 319c066b..62752084 100644
--- a/client/components/settings/settingBody.js
+++ b/client/components/settings/settingBody.js
@@ -48,7 +48,7 @@ BlazeComponent.extendComponent({
         'members.isAdmin': true,
       },
       {
-        sort: ['title'],
+        sort: { sort: 1 /* boards default sorting */ },
       },
     );
   },
-- 
cgit v1.2.3-1-g7c22