2
0
Эх сурвалжийг харах

Fixed Copy card to list does not work, by reverting clientside changes of PR 4333.

Thanks to Meeques, PaulITsoft and xet7 !

Fixes #4341,
fixes #4343
Lauri Ojansivu 3 жил өмнө
parent
commit
a5b376e6b5

+ 0 - 9
client/components/cards/cardDetails.jade

@@ -234,15 +234,6 @@ template(name="cardDetails")
                   +viewer
                     = sort
 
-        if currentBoard.allowsShowLists
-          .card-details-item.card-details-show-lists
-            h3.card-details-item-title
-              i.fa.fa-list
-              | {{_ 'list'}}
-            select.js-select-lists
-              each currentBoard.lists
-                option(value="{{_id}}" selected="{{#if isCurrentListId _id}}selected{{/if}}") {{title}}
-
         //.card-details-items
         if getSpentTime
           .card-details-item.card-details-item-spent

+ 0 - 15
client/components/cards/cardDetails.js

@@ -168,15 +168,6 @@ BlazeComponent.extendComponent({
     );
   },
 
-  /** returns if the list id is the current list id
-   * @param listId list id to check
-   * @return is the list id the current list id ?
-   */
-  isCurrentListId(listId) {
-    const ret = this.data().listId == listId;
-    return ret;
-  },
-
   onRendered() {
     if (Meteor.settings.public.CARD_OPENED_WEBHOOK_ENABLED) {
       // Send Webhook but not create Activities records ---
@@ -388,12 +379,6 @@ BlazeComponent.extendComponent({
             card.move(card.boardId, card.swimlaneId, card.listId, sort);
           }
         },
-        'change .js-select-lists'(event) {
-          let card = this.data();
-          const listSelect = this.$('.js-select-lists')[0];
-          const listId = listSelect.options[listSelect.selectedIndex].value;
-          card.move(card.boardId, card.swimlaneId, listId, card.sort);
-        },
         'click .js-go-to-linked-card'() {
           Utils.goCardId(this.data().linkedId);
         },

+ 3 - 1
client/components/cards/cardDetails.styl

@@ -211,13 +211,13 @@ avatar-radius = 50%
 
     .card-details-item
       margin-right: 0.5em
-      flex-grow: 1
       &:last-child
         margin-right: 0
       &.card-details-item-labels
         display: block
         word-wrap: break-word
         max-width: 95%
+        flex-grow: 1
       &.card-details-item-members,
       &.card-details-item-assignees,
       &.card-details-item-customfield,
@@ -225,6 +225,7 @@ avatar-radius = 50%
         display: block
         word-wrap: break-word
         max-width: 36%
+        flex-grow: 1
       &.card-details-item-creator,
       &.card-details-item-received,
       &.card-details-item-start,
@@ -233,6 +234,7 @@ avatar-radius = 50%
         display: block
         word-wrap: break-word
         max-width: 28%
+        flex-grow: 1
       &.custom-fields
         padding-left: 10px
 

+ 0 - 6
client/components/sidebar/sidebar.jade

@@ -203,12 +203,6 @@ template(name="boardCardSettingsPopup")
         span
           i.fa.fa-sort
           | {{_ 'card-sorting-by-number'}}
-    div.check-div
-      a.flex.js-field-has-card-show-lists(class="{{#if allowsShowLists}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if allowsShowLists}}is-checked{{/if}}")
-        span
-          i.fa.fa-list
-          | {{_ 'card-show-lists'}}
     div.check-div
       a.flex.js-field-has-labels(class="{{#if allowsLabels}}is-checked{{/if}}")
         .materialCheckBox(class="{{#if allowsLabels}}is-checked{{/if}}")

+ 0 - 20
client/components/sidebar/sidebar.js

@@ -827,10 +827,6 @@ BlazeComponent.extendComponent({
     return this.currentBoard.allowsCardSortingByNumber;
   },
 
-  allowsShowLists() {
-    return this.currentBoard.allowsShowLists;
-  },
-
   allowsLabels() {
     return this.currentBoard.allowsLabels;
   },
@@ -1065,22 +1061,6 @@ BlazeComponent.extendComponent({
             this.currentBoard.allowsCardSortingByNumber,
           );
         },
-        'click .js-field-has-card-show-lists'(evt) {
-          evt.preventDefault();
-          this.currentBoard.allowsShowLists = !this.currentBoard
-            .allowsShowLists;
-          this.currentBoard.setAllowsShowLists(
-            this.currentBoard.allowsShowLists,
-          );
-          $(`.js-field-has-card-show-lists ${MCB}`).toggleClass(
-            CKCLS,
-            this.currentBoard.allowsShowLists,
-          );
-          $('.js-field-has-card-show-lists').toggleClass(
-            CKCLS,
-            this.currentBoard.allowsShowLists,
-          );
-        },
         'click .js-field-has-labels'(evt) {
           evt.preventDefault();
           this.currentBoard.allowsLabels = !this.currentBoard.allowsLabels;