Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set individual future-date-input components as clearable, fixes admin Safari bug (#6522)

This commit is contained in:
Penar Musaraj 2018-10-25 20:34:55 -04:00 committed by Sam
parent ed9c21e42c
commit 3c92202654
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
View File

@ -7,6 +7,7 @@
class="silence-until" class="silence-until"
label="admin.user.silence_duration" label="admin.user.silence_duration"
includeFarFuture=true includeFarFuture=true
clearable=false
input=silenceUntil}} input=silenceUntil}}
</label> </label>
</div> </div>

1
app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
View File

@ -8,6 +8,7 @@
class="suspend-until" class="suspend-until"
label="admin.user.suspend_duration" label="admin.user.suspend_duration"
includeFarFuture=true includeFarFuture=true
clearable=false
input=suspendUntil}} input=suspendUntil}}
</label> </label>
</div> </div>

1
app/assets/javascripts/discourse/templates/components/future-date-input.hbs
View File

@ -8,6 +8,7 @@
input=input input=input
includeWeekend=includeWeekend includeWeekend=includeWeekend
includeFarFuture=includeFarFuture includeFarFuture=includeFarFuture
clearable=clearable
none="topic.auto_update_input.none"}} none="topic.auto_update_input.none"}}
</div> </div>

4
app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
View File

@ -44,6 +44,7 @@
{{future-date-input {{future-date-input
class="pin-until" class="pin-until"
includeFarFuture=true includeFarFuture=true
clearable=true
input=model.pinnedInCategoryUntil}} input=model.pinnedInCategoryUntil}}
{{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}} {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
</p> </p>
@ -54,6 +55,7 @@
{{future-date-input {{future-date-input
class="pin-until" class="pin-until"
includeFarFuture=true includeFarFuture=true
clearable=true
input=model.pinnedInCategoryUntil}} input=model.pinnedInCategoryUntil}}
{{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}} {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
</p> </p>
@ -86,6 +88,7 @@
{{future-date-input {{future-date-input
class="pin-until" class="pin-until"
includeFarFuture=true includeFarFuture=true
clearable=true
input=model.pinnedGloballyUntil}} input=model.pinnedGloballyUntil}}
{{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}} {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
</p> </p>
@ -96,6 +99,7 @@
{{future-date-input {{future-date-input
class="pin-until" class="pin-until"
includeFarFuture=true includeFarFuture=true
clearable=true
input=model.pinnedGloballyUntil}} input=model.pinnedGloballyUntil}}
{{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}} {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
</p> </p>

1
app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
View File

@ -164,7 +164,6 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
classNames: ["future-date-input-selector"], classNames: ["future-date-input-selector"],
isCustom: Ember.computed.equal("value", "pick_date_and_time"), isCustom: Ember.computed.equal("value", "pick_date_and_time"),
isBasedOnLastPost: Ember.computed.equal("value", "set_based_on_last_post"), isBasedOnLastPost: Ember.computed.equal("value", "set_based_on_last_post"),
clearable: true,
rowComponent: "future-date-input-selector/future-date-input-selector-row", rowComponent: "future-date-input-selector/future-date-input-selector-row",
headerComponent: headerComponent:
"future-date-input-selector/future-date-input-selector-header", "future-date-input-selector/future-date-input-selector-header",