diff --git a/.travis.yml b/.travis.yml index bf2885c..fcfff36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ rvm: env: - REDMINE_VER=master - REDMINE_VER=4.0-stable + - REDMINE_VER=4.1-stable install: - bash -x ./travis/travis_install.sh script: diff --git a/README.rdoc b/README.rdoc index 6b5c9a5..7a8f59c 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,3 +1,6 @@ +{Build Status}[https://travis-ci.org/haru/redmine_wiki_extensions] +{Coverage Status}[https://coveralls.io/github/haru/redmine_wiki_extensions?branch=master] + = Redmine Wiki Extensions Plugin Wiki Extensions is a plugin which adds several useful wiki macros to Redmine. diff --git a/app/controllers/wiki_extensions_settings_controller.rb b/app/controllers/wiki_extensions_settings_controller.rb index 1ff2f97..f41df49 100644 --- a/app/controllers/wiki_extensions_settings_controller.rb +++ b/app/controllers/wiki_extensions_settings_controller.rb @@ -1,5 +1,5 @@ # Wiki Extensions plugin for Redmine -# Copyright (C) 2009-2017 Haruyuki Iida +# Copyright (C) 2009-2020 Haruyuki Iida # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -32,9 +32,6 @@ def update menu_setting.attributes = menu.permit(:enabled, :menu_no, :title, :page_name) menu_setting.save! } - #setting.auto_preview_enabled = auto_preview_enabled - setting.attributes = params.require(:setting).permit(:auto_preview_enabled, :tag_disabled) - setting.save! end flash[:notice] = l(:notice_successful_update) rescue => e diff --git a/init.rb b/init.rb index 96ebfd4..d1ebfb7 100644 --- a/init.rb +++ b/init.rb @@ -1,5 +1,5 @@ # Wiki Extensions plugin for Redmine -# Copyright (C) 2009-2017 Haruyuki Iida +# Copyright (C) 2009-2020 Haruyuki Iida # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -36,7 +36,7 @@ author_url 'http://twitter.com/haru_iida' description 'This is a Wiki Extensions plugin for Redmine' url 'http://www.r-labs.org/projects/r-labs/wiki/Wiki_Extensions_en' - version '0.9.0' + version '0.9.1' requires_redmine :version_or_higher => '4.0.0' project_module :wiki_extensions do diff --git a/test/functional/wiki_extensions_settings_controller_test.rb b/test/functional/wiki_extensions_settings_controller_test.rb index 60691de..97b8578 100644 --- a/test/functional/wiki_extensions_settings_controller_test.rb +++ b/test/functional/wiki_extensions_settings_controller_test.rb @@ -41,7 +41,7 @@ def setup menus = {} menus[0] = {:enabled => 'true',:menu_no => 1, :title => 'my_title', :page_name => 'my_page_name'} menus[1] = {:enabled => 'true',:menu_no => 2, :title => 'my_title2', :page_name => 'my_page_name2'} - post :update, :params => {:setting => {:auto_preview_enabled => 1}, + post :update, :params => { :menus => menus, :id => @project} assert_response :redirect setting = WikiExtensionsSetting.find_or_create @project.id