Skip to content

Commit b2424fe

Browse files
authored
Merge pull request #1 from dupeg/wip-123125_fixe_sprint_show_US_of_main_project_only
fixe error: sprint shows only US of the main project
2 parents a13b26d + 439a29a commit b2424fe

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

app/models/rb_issue_history.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def self.burndown_timezone(recalc=nil)
1919
@burndown_timezone ||= begin
2020
server_tz = ActiveSupport::TimeZone["Etc/GMT-#{Time.now.utc_offset/3600}"] rescue server_tz = nil
2121
fallback_tz = server_tz || ActiveSupport::TimeZone["UTC"]
22-
if Backlogs.settings[:burndown_timezone] #backlogs configuration for burndown day boundaries
23-
ActiveSupport::TimeZone[Backlogs.settings[:burndown_timezone]] || fallback_tz
22+
if Backlogs.setting[:burndown_timezone] #backlogs configuration for burndown day boundaries
23+
ActiveSupport::TimeZone[Backlogs.setting[:burndown_timezone]] || fallback_tz
2424
else
2525
fallback_tz
2626
end

app/models/rb_story.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def self.__find_options_add_permissions(options)
2626
end
2727

2828
def self.__find_options_sprint_condition(project_id, sprint_ids)
29-
if Backlogs.settings[:sharing_enabled]
29+
if Backlogs.setting[:sharing_enabled]
3030
["
3131
tracker_id in (?)
3232
and fixed_version_id IN (?)", self.trackers, sprint_ids]

app/views/rb_stories/_helpers.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<select class="tracker_id helper" id="tracker_id_options">
1717
<%- RbStory.trackers(:project => @project, :type => :trackers).each do |tracker| %>
18-
<%- if (Backlogs.settings[:default_story_tracker] && tracker.id.to_s==Backlogs.settings[:default_story_tracker]) %>
18+
<%- if (Backlogs.setting[:default_story_tracker] && tracker.id.to_s==Backlogs.setting[:default_story_tracker]) %>
1919
<option value="<%= tracker.id %>" selected="selected"><%= h tracker.name %></option>
2020
<%- else %>
2121
<option value="<%= tracker.id %>"><%= h tracker.name %></option>

app/views/rb_tasks/_task.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="t"><%= assignee_name_or_empty(task) %></div>
1313
<div class="v"><%= assignee_id_or_empty(task) %></div>
1414
</div>
15-
<% if Backlogs.settings[:show_priority] || task.priority_id != IssuePriority.default.id %>
15+
<% if Backlogs.setting[:show_priority] || task.priority_id != IssuePriority.default.id %>
1616
<div class="priority_id editable" fieldtype="select" fieldname="priority_id" fieldlabel="<%=l(:field_priority)%>">
1717
<div class="t"><%= h task.priority.name %></div>
1818
<div class="v"><%= task.priority_id %></div>

0 commit comments

Comments
 (0)