Skip to content

O
OHR Support
Commit 6c8b87fb authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Adds a permission for exporting wiki pages. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3371 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent e5d300af
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 14 deletions
app/controllers/wiki_controller.rb
View file @ 6c8b87fb
......@@ -47,15 +47,17 @@ class WikiController < ApplicationController
return
end
@content = @page.content_for_version(params[:version])
if params[:format] == 'html'
export = render_to_string :action => 'export', :layout => false
send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
return
elsif params[:format] == 'txt'
send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
return
if User.current.allowed_to?(:export_wiki_pages, @project)
if params[:format] == 'html'
export = render_to_string :action => 'export', :layout => false
send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
return
elsif params[:format] == 'txt'
send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
return
end
end
@editable = editable?
@editable = editable?
render :action => 'show'
end
......@@ -177,9 +179,13 @@ class WikiController < ApplicationController
@pages_by_parent_id = @pages.group_by(&:parent_id)
# export wiki to a single html file
when 'export'
@pages = @wiki.pages.find :all, :order => 'title'
export = render_to_string :action => 'export_multiple', :layout => false
send_data(export, :type => 'text/html', :filename => "wiki.html")
if User.current.allowed_to?(:export_wiki_pages, @project)
@pages = @wiki.pages.find :all, :order => 'title'
export = render_to_string :action => 'export_multiple', :layout => false
send_data(export, :type => 'text/html', :filename => "wiki.html")
else
redirect_to :action => 'index', :id => @project, :page => nil
end
return
else
# requested special page doesn't exist, redirect to default page
......
app/views/wiki/show.rhtml
View file @ 6c8b87fb
......@@ -48,7 +48,7 @@
<% other_formats_links do |f| %>
<%= f.link_to 'HTML', :url => {:page => @page.title, :version => @content.version} %>
<%= f.link_to 'TXT', :url => {:page => @page.title, :version => @content.version} %>
<% end %>
<% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
<% content_for :header_tags do %>
<%= stylesheet_link_tag 'scm' %>
......
app/views/wiki/special_date_index.rhtml
View file @ 6c8b87fb
......@@ -24,7 +24,7 @@
<% unless @pages.empty? %>
<% other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
<%= f.link_to 'HTML', :url => {:action => 'special', :page => 'export'} %>
<%= f.link_to('HTML', :url => {:action => 'special', :page => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
<% end %>
<% end %>
......
app/views/wiki/special_page_index.rhtml
View file @ 6c8b87fb
......@@ -17,7 +17,7 @@
<% unless @pages.empty? %>
<% other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
<%= f.link_to 'HTML', :url => {:action => 'special', :page => 'export'} %>
<%= f.link_to('HTML', :url => {:action => 'special', :page => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
<% end %>
<% end %>
......
config/locales/bg.yml
View file @ 6c8b87fb
......@@ -878,3 +878,4 @@ bg:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/bs.yml
View file @ 6c8b87fb
......@@ -902,3 +902,4 @@ bs:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/ca.yml
View file @ 6c8b87fb
......@@ -881,3 +881,4 @@ ca:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/cs.yml
View file @ 6c8b87fb
......@@ -884,3 +884,4 @@ cs:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/da.yml
View file @ 6c8b87fb
......@@ -904,3 +904,4 @@ da:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/de.yml
View file @ 6c8b87fb
......@@ -904,3 +904,4 @@ de:
label_close_versions: Vollständige Versionen schließen
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/el.yml
View file @ 6c8b87fb
......@@ -884,3 +884,4 @@ el:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/en.yml
View file @ 6c8b87fb
......@@ -382,6 +382,7 @@ en:
permission_edit_own_messages: Edit own messages
permission_delete_messages: Delete messages
permission_delete_own_messages: Delete own messages
permission_export_wiki_pages: Export wiki pages
project_module_issue_tracking: Issue tracking
project_module_time_tracking: Time tracking
......
config/locales/es.yml
View file @ 6c8b87fb
......@@ -928,3 +928,4 @@ es:
label_close_versions: Cerrar versiones completadas
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/eu.yml
View file @ 6c8b87fb
......@@ -888,3 +888,4 @@ eu:
enumeration_system_activity: Sistemako Jarduera
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/fi.yml
View file @ 6c8b87fb
......@@ -914,3 +914,4 @@ fi:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/fr.yml
View file @ 6c8b87fb
......@@ -405,6 +405,7 @@ fr:
permission_edit_own_messages: Modifier ses propres messages
permission_delete_messages: Supprimer les messages
permission_delete_own_messages: Supprimer ses propres messages
permission_export_wiki_pages: Exporter les pages
project_module_issue_tracking: Suivi des demandes
project_module_time_tracking: Suivi du temps passé
......
config/locales/gl.yml
View file @ 6c8b87fb
......@@ -904,3 +904,4 @@ gl:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/he.yml
View file @ 6c8b87fb
......@@ -888,3 +888,4 @@ he:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/hr.yml
View file @ 6c8b87fb
......@@ -891,3 +891,4 @@ hr:
Are you sure you want to continue?
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/hu.yml
View file @ 6c8b87fb
......@@ -909,3 +909,4 @@
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/id.yml
View file @ 6c8b87fb
......@@ -896,3 +896,4 @@ id:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/it.yml
View file @ 6c8b87fb
......@@ -891,3 +891,4 @@ it:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/ja.yml
View file @ 6c8b87fb
......@@ -913,3 +913,4 @@ ja:
enumeration_doc_categories: 文書カテゴリ
enumeration_activities: 作業分類 (時間トラッキング)
enumeration_system_activity: システム作業分類
permission_export_wiki_pages: Export wiki pages
config/locales/ko.yml
View file @ 6c8b87fb
......@@ -944,3 +944,4 @@ ko:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/lt.yml
View file @ 6c8b87fb
......@@ -952,3 +952,4 @@ lt:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/nl.yml
View file @ 6c8b87fb
......@@ -866,3 +866,4 @@ nl:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/no.yml
View file @ 6c8b87fb
......@@ -879,3 +879,4 @@
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/pl.yml
View file @ 6c8b87fb
......@@ -909,3 +909,4 @@ pl:
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/pt-BR.yml
View file @ 6c8b87fb
......@@ -912,3 +912,4 @@ pt-BR:
label_board_sticky: Marcado
label_board_locked: Travado
label_change_log: Registro de alterações
permission_export_wiki_pages: Export wiki pages
config/locales/pt.yml
View file @ 6c8b87fb
......@@ -896,3 +896,4 @@ pt:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/ro.yml
View file @ 6c8b87fb
......@@ -881,3 +881,4 @@ ro:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/ru.yml
View file @ 6c8b87fb
......@@ -992,3 +992,4 @@ ru:
label_close_versions: Закрыть завершенные версии
label_board_sticky: Прикреплена
label_board_locked: Заблокирована
permission_export_wiki_pages: Export wiki pages
config/locales/sk.yml
View file @ 6c8b87fb
......@@ -883,3 +883,4 @@ sk:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/sl.yml
View file @ 6c8b87fb
......@@ -880,3 +880,4 @@ sl:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/sr.yml
View file @ 6c8b87fb
......@@ -899,3 +899,4 @@
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/sv.yml
View file @ 6c8b87fb
......@@ -933,3 +933,4 @@ sv:
enumeration_doc_categories: Dokumentkategorier
enumeration_activities: Aktiviteter (tidsuppföljning)
enumeration_system_activity: Systemaktivitet
permission_export_wiki_pages: Export wiki pages
config/locales/th.yml
View file @ 6c8b87fb
......@@ -881,3 +881,4 @@ th:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/tr.yml
View file @ 6c8b87fb
......@@ -911,3 +911,4 @@ tr:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/uk.yml
View file @ 6c8b87fb
......@@ -880,3 +880,4 @@ uk:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/vi.yml
View file @ 6c8b87fb
......@@ -943,3 +943,4 @@ vi:
label_close_versions: Close completed versions
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
config/locales/zh-TW.yml
View file @ 6c8b87fb
......@@ -975,3 +975,4 @@
enumeration_doc_categories: 文件分類
enumeration_activities: 活動 (時間追蹤)
enumeration_system_activity: 系統活動
permission_export_wiki_pages: Export wiki pages
config/locales/zh.yml
View file @ 6c8b87fb
......@@ -906,3 +906,4 @@ zh:
enumeration_system_activity: 系统活动
label_board_sticky: Sticky
label_board_locked: Locked
permission_export_wiki_pages: Export wiki pages
lib/redmine.rb
View file @ 6c8b87fb
......@@ -92,6 +92,7 @@ Redmine::AccessControl.map do |map|
map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
map.permission :view_wiki_pages, :wiki => [:index, :special]
map.permission :export_wiki_pages, {}
map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment]
map.permission :delete_wiki_pages_attachments, {}
......
test/fixtures/roles.yml
View file @ 6c8b87fb
......@@ -33,6 +33,7 @@ roles_001:
- :view_documents
- :manage_documents
- :view_wiki_pages
- :export_wiki_pages
- :view_wiki_edits
- :edit_wiki_pages
- :delete_wiki_pages_attachments
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment