소스 검색

Support show week of year toggle in cardCustomFields

Nadav Tasher 5 달 전
부모
커밋
08cde06ce5
2개의 변경된 파일11개의 추가작업 그리고 5개의 파일을 삭제
  1. 7 5
      client/components/cards/cardCustomFields.jade
  2. 4 0
      client/components/cards/cardCustomFields.js

+ 7 - 5
client/components/cards/cardCustomFields.jade

@@ -79,13 +79,14 @@ template(name="cardCustomField-currency")
 
 template(name="cardCustomField-date")
     if canModifyCard
-      a.js-edit-date(title="{{showTitle}} {{_ 'predicate-week'}} {{showWeek}}" class="{{classes}}")
+      a.js-edit-date(title="{{showTitle}} {{_ 'predicate-week'}} {{#if showWeekOfYear}}{{showWeek}}{{/if}}" class="{{classes}}")
         if value
           div.card-date
             time(datetime="{{showISODate}}")
               | {{showDate}}
-              b
-                | {{showWeek}}
+              if showWeekOfYear
+                b
+                  | {{showWeek}}
         else
           | {{_ 'edit'}}
     else
@@ -93,8 +94,9 @@ template(name="cardCustomField-date")
         div.card-date
           time(datetime="{{showISODate}}")
             | {{showDate}}
-            b
-              | {{showWeek}}
+            if showWeekOfYear
+                b
+                | {{showWeek}}
 
 template(name="cardCustomField-dropdown")
     if canModifyCard

+ 4 - 0
client/components/cards/cardCustomFields.js

@@ -148,6 +148,10 @@ CardCustomField.register('cardCustomField');
     return this.date.get().week().toString();
   }
 
+  showWeekOfYear() {
+    return ReactiveCache.getCurrentUser().isShowWeekOfYear();
+  }
+
   showDate() {
     // this will start working once mquandalle:moment
     // is updated to at least moment.js 2.10.5