Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jul 19, 2012
@yeah yeah fixes settings view 6a6d503
Commits on Jul 23, 2012
Jan Schulz-Hofen qualify position column by table name to avoid incompatibility with p…
…lugins which add a position column to the issues table
4fa1736
View
6 app/models/kanban_issue.rb
@@ -47,21 +47,21 @@ def scope_condition
# state transitions.
named_scope :find_selected, lambda {
{
- :order => 'position ASC',
+ :order => "#{KanbanIssue.table_name}.position ASC",
:conditions => { :user_id => nil, :state => 'selected'}
}
}
named_scope :find_active, lambda {
{
- :order => "#{KanbanIssue.table_name}.user_id ASC, position ASC",
+ :order => "#{KanbanIssue.table_name}.user_id ASC, #{KanbanIssue.table_name}.position ASC",
:conditions => { :state => 'active'}
}
}
named_scope :find_testing, lambda {
{
- :order => "#{KanbanIssue.table_name}.user_id ASC, position ASC",
+ :order => "#{KanbanIssue.table_name}.user_id ASC, #{KanbanIssue.table_name}.position ASC",
:conditions => { :state => 'testing'}
}
}
View
5 app/views/settings/_kanban_general.html.erb
@@ -52,9 +52,8 @@
<p>
<%= content_tag(:label, l(:kanban_label_incoming_projects)) %>
- <% incoming_projects = @settings['incoming_projects'] || []
- incoming_projects.collect!(&:to_i) if incoming_projects.present?
- %>
+ <% incoming_projects = @settings['incoming_projects'] || [] %>
+ <% incoming_projects.collect!(&:to_i) if incoming_projects.present? %>
<%= select_tag("settings[incoming_projects]",
content_tag(:option, '') +
options_from_collection_for_select(Project.all,

No commit comments for this range

Something went wrong with that request. Please try again.