redmine_tweaks no longer depends on wiki extensions
This commit is contained in:
parent
c5ffbbc518
commit
534f4a22cb
@ -18,7 +18,6 @@
|
||||
|
||||
## Requirements
|
||||
|
||||
* Wiki extensions plugin: http://www.r-labs.org/projects/r-labs/wiki/Wiki_Extensions_en
|
||||
* Redmine version >= 2.3.3
|
||||
|
||||
|
||||
@ -88,6 +87,10 @@ Note: Redmine must be restarted after changing "Custom Help URL"</tt> value befo
|
||||
|
||||
## Changelog
|
||||
|
||||
### 0.4.2
|
||||
|
||||
- no requirements of Wiki extensions plugin anymore
|
||||
|
||||
### 0.4.1
|
||||
|
||||
- Fix problem with my page permission
|
||||
|
7
init.rb
7
init.rb
@ -25,7 +25,7 @@ Redmine::Plugin.register :redmine_tweaks do
|
||||
name 'Redmine Tweaks'
|
||||
author 'AlphaNodes GmbH'
|
||||
description 'Wiki and content extensions'
|
||||
version '0.4.1'
|
||||
version '0.4.2'
|
||||
author_url 'http://alphanodes.com/'
|
||||
url 'http://github.com/alexandermeindl/redmine_tweaks'
|
||||
|
||||
@ -48,10 +48,6 @@ Redmine::Plugin.register :redmine_tweaks do
|
||||
# required redmine version
|
||||
requires_redmine :version_or_higher => '2.3.3'
|
||||
|
||||
# for formating (div/hr)
|
||||
# ! does not work with plugin redmine_wiki_extensions
|
||||
# requires_redmine_plugin :redmine_wiki_extensions, :version_or_higher => '0.6.4'
|
||||
|
||||
# Add Task board
|
||||
menu :top_menu, :task_board, { :controller => 'wiki', :action => 'show', :id => 'Task_board', :project_id => 'common' },
|
||||
:if => Proc.new{User.current.allowed_to?({:controller => 'wiki', :action => 'show', :id => 'Task_board', :project_id => 'common'}, nil, {:global => true}) && RedmineTweaks.settings[:show_task_board_link] }
|
||||
@ -64,6 +60,7 @@ Redmine::Plugin.register :redmine_tweaks do
|
||||
menu :top_menu, :my_page, { :controller => 'my', :action => 'page'}, :via => :get,
|
||||
:if => Proc.new{User.current && !RedmineTweaks.settings[:remove_mypage] }
|
||||
|
||||
RedCloth3::ALLOWED_TAGS << "div"
|
||||
end
|
||||
|
||||
if Rails::VERSION::MAJOR >= 3
|
||||
|
@ -37,7 +37,7 @@ module RedmineTweaks
|
||||
|
||||
wiki_header = '' + Setting.plugin_redmine_tweaks['global_wiki_header']
|
||||
|
||||
if WikiExtensionsUtil.is_enabled?(@project)
|
||||
if Object.const_defined?('WikiExtensionsUtil') && WikiExtensionsUtil.is_enabled?(@project)
|
||||
header = @wiki.find_page('Header')
|
||||
if header
|
||||
return
|
||||
@ -60,7 +60,7 @@ module RedmineTweaks
|
||||
|
||||
wiki_footer = '' + Setting.plugin_redmine_tweaks['global_wiki_footer']
|
||||
|
||||
if WikiExtensionsUtil.is_enabled?(@project)
|
||||
if Object.const_defined?('WikiExtensionsUtil') && WikiExtensionsUtil.is_enabled?(@project)
|
||||
footer = @wiki.find_page('Footer')
|
||||
if footer
|
||||
return
|
||||
|
Loading…
x
Reference in New Issue
Block a user