Skip to content
This repository was archived by the owner on Jan 30, 2018. It is now read-only.

fix time tracking, calendar current time zone bug #40

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix time tracking, calendar current time zone bug #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/helpers/calendars_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def build_calendar(year,month,small=false)

cell_text = "<div class=\"cd\">#{cur.mday}</div>"
cell_attrs = {}
cell_attrs[:class] = "day this_month cal_wd#{cur.wday} #{'today' if (cur == Time.current.to_date)} "
cell_attrs[:class] = "day this_month cal_wd#{cur.wday} #{'today' if (cur == Time.current.in_time_zone(current_user.time_zone).to_date)} "
cell_attrs[:id] = "day_#{cur.month}_#{cur.mday}"

#if markable?(calendar,marked,year,month,cell_text)
Expand Down