Skip to content

Commit

Permalink
Merge pull request #35 from Undev/master
Browse files Browse the repository at this point in the history
redmine-2.1 + redmine 2.2 compatibility + mysql2 adapter fix + fixed migrations
  • Loading branch information
friflaj authored and friflaj committed Dec 27, 2012
2 parents 775e469 + 62aa968 commit a91fcf9
Show file tree
Hide file tree
Showing 9 changed files with 63 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,2 +1,2 @@
gem 'acts-as-taggable-on', '~> 2.3.1'
gem "rails_sql_views", :git => "git://github.com/anathematic/rails_sql_views.git"
gem "rails_sql_views", :git => "git://github.com/Undev/rails_sql_views.git"
8 changes: 8 additions & 0 deletions db/migrate/011_create_views.rb
Expand Up @@ -10,5 +10,13 @@ def self.down
drop_view :issue_tags
drop_view :wiki_page_tags
end

def up
self.class.up
end

def down
self.class.down
end
end

8 changes: 8 additions & 0 deletions db/migrate/012_scrub_body.rb
Expand Up @@ -28,5 +28,13 @@ def self.up

def self.down
end

def up
self.class.up
end

def down
self.class.down
end
end

7 changes: 7 additions & 0 deletions db/migrate/013_recreate_views.rb
Expand Up @@ -9,6 +9,13 @@ def self.up
def self.down
# noop
end

def up
self.class.up
end

def down
self.class.down
end
end

8 changes: 8 additions & 0 deletions db/migrate/014_fix_tagging_contexts.rb
Expand Up @@ -17,5 +17,13 @@ def self.down
tagging.save
end
end

def up
self.class.up
end

def down
self.class.down
end
end

8 changes: 8 additions & 0 deletions db/migrate/016_fix_broken_issue_and_wiki_contexts.rb
Expand Up @@ -38,5 +38,13 @@ def self.up

def self.down
end

def up
self.class.up
end

def down
self.class.down
end
end

8 changes: 8 additions & 0 deletions db/migrate/018_fix_tags_with_backslash.rb
Expand Up @@ -8,4 +8,12 @@ def self.up

def self.down
end

def up
self.class.up
end

def down
self.class.down
end
end
3 changes: 2 additions & 1 deletion lib/tagging_plugin/tagging_query_patch.rb
Expand Up @@ -36,7 +36,8 @@ def available_filters_with_tags
:type => :list_optional,
:values => tags,
:name => l(:field_tags),
:order => 20
:order => 21,
:field => "tags"
}
}

Expand Down
13 changes: 13 additions & 0 deletions test/functional/issues_controller_test.rb
Expand Up @@ -21,6 +21,19 @@ def setup
Issue.stubs(:allowed_target_projects_on_move).returns(Project.all)
end

def test_can_index_issues_when_custom_fields_available
IssueCustomField.create!({
:name => "cfield",
:default_value => "ok",
:is_filter => true,
:field_format => "string",
:is_for_all => true
})

get :index
assert_response :success
end

def test_can_index_api
get :index, :format => 'json'
assert_response :success
Expand Down

0 comments on commit a91fcf9

Please sign in to comment.