Merge upstream/master

* commit '56667112d7': Update ChangeLog. Minicard labels on the top and title on bottom. Update translations. Update translations. Add translations for Notification drawer like Trello. Add translations for Board Settings / Allow Rename Board/Swimlane/Card. Update ChangeLog. Fix start-wekan.sh MongoDB port to 27017. v3.87 Update translations. Update ChangeLog. Improvements on card details visualization. Update ChangeLog. Move "Rules" from "Board View" to "Board Settings". Update ChangeLog. Fix richer editor submit did not clear edit area. Update ChangeLog. Fix Browser always reload the whole page when I change one of the card color. Fixed by making label colors and text again editable. Regression from [Wekan v3.86 2)](b9099a8b7e).
2026-01-06 09:38:49 +01:00 · 2020-04-01 14:37:49 -06:00 · 2020-04-01 14:37:49 -06:00 · fcb1def355
commit fcb1def355
parent 9819c9f801 56667112d7
73 changed files with 442 additions and 353 deletions
--- a/client/components/activities/comments.js
+++ b/client/components/activities/comments.js
@ -33,13 +33,6 @@ BlazeComponent.extendComponent({
              cardId,
            });
            resetCommentInput(input);
-            // With Richer editor is in use, and comment is submitted,
-            // clear comment form with JQuery. Id #summernote is defined
-            // at client/components/main/editor.jade where it previously was
-            // id=id, now it is id="summernote".
-            if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR === 'true') {
-              $('#summernote').summernote('code', '');
-            }
            Tracker.flush();
            autosize.update(input);
            input.trigger('submitted');
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@ -193,20 +193,6 @@ template(name="boardChangeViewPopup")
          | {{_ 'board-view-cal'}}
          if $eq Utils.boardView "board-view-cal"
            i.fa.fa-check
-    if currentUser.isAdmin
-      hr
-      li
-        with "board-view-rules"
-          a.js-open-rules-view(title="{{_ 'rules'}}")
-            i.fa.fa-magic
-            | {{_ 'rules'}}
-    else if currentUser.isBoardAdmin
-      hr
-      li
-        with "board-view-rules"
-          a.js-open-rules-view(title="{{_ 'rules'}}")
-            i.fa.fa-magic
-            | {{_ 'rules'}}

 template(name="createBoard")
  form
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@ -191,10 +191,6 @@ Template.boardChangeViewPopup.events({
    Utils.setBoardView('board-view-cal');
    Popup.close();
  },
-  'click .js-open-rules-view'() {
-    Modal.openWide('rulesMain');
-    Popup.close();
-  },
 });

 const CreateBoard = BlazeComponent.extendComponent({
--- a/client/components/cards/attachments.jade
+++ b/client/components/cards/attachments.jade
@ -55,5 +55,5 @@ template(name="attachmentsGalery")
        unless currentUser.isWorker
          //li.attachment-item.add-attachment
          a.js-add-attachment
-            i.fa.fa-paperclip
+            i.fa.fa-plus
            | {{_ 'add-attachment' }}
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@ -203,6 +203,7 @@ template(name="cardDetails")
    if canModifyCard
      unless currentUser.isWorker
        if currentBoard.allowsDescriptionTitle
+          hr
          h3
            i.fa.fa-align-left
            card-details-item-title {{_ 'description'}}
@ -229,6 +230,7 @@ template(name="cardDetails")
                  a.js-close-inlined-form {{_ 'discard'}}
    else if getDescription
      if currentBoard.allowsDescriptionTitle
+        hr
        h3.card-details-item-title {{_ 'description'}}
      if currentBoard.allowsDescriptionText
        +viewer
@ -237,15 +239,16 @@ template(name="cardDetails")
    .card-checklist-attachmentGalerys
      .card-checklist-attachmentGalery.card-checklists
        if currentBoard.allowsChecklists
+          hr
          +checklists(cardId = _id)
        if currentBoard.allowsSubtasks
          hr
          +subtasks(cardId = _id)
      if currentBoard.allowsAttachments
-        //- hr
-        //- h3
-        //- i.fa.fa-paperclip
-        //- | {{_ 'attachments'}}
+        hr
+        h3
+          i.fa.fa-paperclip
+          | {{_ 'attachments'}}
        .card-checklist-attachmentGalery.card-attachmentGalery
          +attachmentsGalery

--- a/client/components/cards/minicard.styl
+++ b/client/components/cards/minicard.styl
@ -79,7 +79,7 @@
    border-radius: top 2px

  .minicard-labels
-    float: right
+    float: none
    display: flex
    flex-wrap: wrap

--- a/client/components/main/editor.jade
+++ b/client/components/main/editor.jade
@ -1,13 +1,8 @@
 template(name="editor")
-  // With Richer editor is in use, and comment is submitted,
-  // clear comment form with JQuery Comment at
-  // client/components/activities/comments.js . Id #summernote is defined
-  // here at client/components/main/editor.jade where it previously was
-  // id=id, now it is id="summernote".
  textarea.editor(
    dir="auto"
    class="{{class}}"
-    id="summernote"
+    id=id
    autofocus=autofocus
    placeholder="{{_ 'comment-placeholder'}}")
    +Template.contentBlock
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@ -30,7 +30,7 @@ Template.editor.onRendered(() => {
    autosize($textarea);
    $textarea.escapeableTextComplete(mentions);
  };
-  if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR === 'true') {
+  if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR !== false) {
    const isSmall = Utils.isMiniScreen();
    const toolbar = isSmall
      ? [
@ -108,45 +108,17 @@ Template.editor.onRendered(() => {
        }
        return undefined;
      };
-      // Prevent @member mentions on Add Comment input field
-      // from closing card, part 1.
-      let popupShown = false;
      inputs.each(function(idx, input) {
        mSummernotes[idx] = $(input).summernote({
          placeholder,
-          // Prevent @member mentions on Add Comment input field
-          // from closing card, part 2.
-          onKeydown(e) {
-            if (popupShown) {
-              e.preventDefault();
-            }
-          },
-          onKeyup(e) {
-            if (popupShown) {
-              e.preventDefault();
-            }
-          },
          callbacks: {
-            // Prevent @member mentions on Add Comment input field
-            // from closing card, part 3.
-            onKeydown(e) {
-              if (popupShown) {
-                e.preventDefault();
-              }
-            },
-            onKeyup(e) {
-              if (popupShown) {
-                e.preventDefault();
-              }
-            },
            onInit(object) {
              const originalInput = this;
-              $(originalInput).on('input', function() {
+              $(originalInput).on('submitted', function() {
                // when comment is submitted, the original textarea will be set to '', so shall we
                if (!this.value) {
                  const sn = getSummernote(this);
-                  sn && sn.summernote('reset');
-                  object && object.editingArea.find('.note-placeholder').show();
+                  sn && sn.summernote('code', '');
                }
              });
              const jEditor = object && object.editable;
@ -163,6 +135,7 @@ Template.editor.onRendered(() => {
                });
              }
            },
+
            onImageUpload(files) {
              const $summernote = getSummernote(this);
              if (files && files.length > 0) {
@ -249,7 +222,7 @@ Template.editor.onRendered(() => {
                // == Fix End ==
                const original = someNote.summernote('code');
                const cleaned = cleanPastedHTML(original); //this is where to call whatever clean function you want. I have mine in a different file, called CleanPastedHTML.
-                someNote.summernote('reset'); //clear original
+                someNote.summernote('code', ''); //clear original
                someNote.summernote('pasteHTML', cleaned); //this sets the displayed content editor to the cleaned pasted code.
              };
              setTimeout(function() {
@ -316,15 +289,15 @@ Blaze.Template.registerHelper(

    let currentMention;
    while ((currentMention = mentionRegex.exec(content)) !== null) {
-      const [fullMention, username] = currentMention;
+      const [fullMention, quoteduser, simple] = currentMention;
+      const username = quoteduser || simple;
      const knowedUser = _.findWhere(knowedUsers, { username });
      if (!knowedUser) {
        continue;
      }

      const linkValue = [' ', at, knowedUser.username];
-      //let linkClass = 'atMention js-open-member';
-      let linkClass = 'atMention';
+      let linkClass = 'atMention js-open-member';
      if (knowedUser.userId === Meteor.userId()) {
        linkClass += ' me';
      }
@ -357,25 +330,24 @@ Template.viewer.events({
  // the corresponding text). Clicking a link shouldn't fire these actions, stop
  // we stop these event at the viewer component level.
  'click a'(event, templateInstance) {
-    event.stopPropagation();
-
-    // XXX We hijack the build-in browser action because we currently don't have
-    // `_blank` attributes in viewer links, and the transformer function is
-    // handled by a third party package that we can't configure easily. Fix that
-    // by using directly `_blank` attribute in the rendered HTML.
-    event.preventDefault();
-
+    let prevent = true;
    const userId = event.currentTarget.dataset.userid;
    if (userId) {
-      // Prevent @member mentions on Add Comment input field
-      // from closing card, part 4.
-      PopupNoClose.open('member').call({ userId }, event, templateInstance);
-      event.preventDefault();
+      Popup.open('member').call({ userId }, event, templateInstance);
    } else {
      const href = event.currentTarget.href;
      if (href) {
        window.open(href, '_blank');
      }
    }
+    if (prevent) {
+      event.stopPropagation();
+
+      // XXX We hijack the build-in browser action because we currently don't have
+      // `_blank` attributes in viewer links, and the transformer function is
+      // handled by a third party package that we can't configure easily. Fix that
+      // by using directly `_blank` attribute in the rendered HTML.
+      event.preventDefault();
+    }
  },
 });
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@ -267,6 +267,10 @@ template(name="outgoingWebhooksPopup")

 template(name="boardMenuPopup")
  ul.pop-over-list
+    li
+      a.js-open-rules-view(title="{{_ 'rules'}}")
+        i.fa.fa-magic
+        | {{_ 'rules'}}
    li
      a.js-custom-fields
        i.fa.fa-list-alt
--- a/client/components/sidebar/sidebar.js
+++ b/client/components/sidebar/sidebar.js
@ -182,6 +182,10 @@ Template.memberPopup.helpers({

 Template.boardMenuPopup.events({
  'click .js-rename-board': Popup.open('boardChangeTitle'),
+  'click .js-open-rules-view'() {
+    Modal.openWide('rulesMain');
+    Popup.close();
+  },
  'click .js-custom-fields'() {
    Sidebar.setView('customFields');
    Popup.close();