IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Future date input selector was not respecting timezone

Browse Source
This commit is contained in:
Robin Ward 2017-11-28 13:44:24 -05:00
parent f4b3306bf4
commit 23ee3047bf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ export function timeframeDetails(id) {
return _timeframeById[id]; return _timeframeById[id];
} }
export const FORMAT = "YYYY-MM-DD HH:mm"; export const FORMAT = "YYYY-MM-DD HH:mm Z";
export default ComboBoxComponent.extend(DatetimeMixin, { export default ComboBoxComponent.extend(DatetimeMixin, {
pluginApiIdentifiers: ["future-date-input-selector"], pluginApiIdentifiers: ["future-date-input-selector"],

4
app/models/user.rb
View File

@ -657,11 +657,11 @@ class User < ActiveRecord::Base
end end
def suspended? def suspended?
!!(suspended_till && suspended_till > DateTime.now) !!(suspended_till && suspended_till > Time.zone.now)
end end
def silenced? def silenced?
!!(silenced_till && silenced_till > DateTime.now) !!(silenced_till && silenced_till > Time.zone.now)
end end
def silenced_record def silenced_record