jro_apps/redmine Commit - r537:6446c312beab

0

db/migrate/049_add_wiki_destroy_page_permission.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddWikiDestroyPagePermission < ActiveRecord::Migration
	2	def self.up
	3	Permission.create :controller => 'wiki', :action => 'destroy', :description => 'button_delete', :sort => 1740, :is_public => false, :mail_option => 0, :mail_enabled => 0
	4	end
	5
	6	def self.down
	7	Permission.find_by_controller_and_action('wiki', 'destroy').destroy
	8	end
	9	end

0

app/controllers/wiki_controller.rb +11 -1

             class WikiController < ApplicationController
               layout 'base'
               before_filter :find_wiki, :check_project_privacy, :except => [:preview]
+              before_filter :authorize, :only => :destroy
+              verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }
               # display a page (in editing mode if it doesn't exist)
               def index
                 page_title = params[:page]
                                                         :select => "id, author_id, comments, updated_on, version",
                                                         :order => 'version DESC'
               end
+              # remove a wiki page and its history
+              def destroy
+                @page = @wiki.find_page(params[:page])
+                @page.destroy if @page
+                redirect_to :action => 'special', :id => @project, :page => 'Page_index'
+              end
               # display special pages
               def special

0

app/models/permission.rb +1 0

 => :label_attachment_plural,
 => :label_repository,
 => :label_time_tracking,
+=> :label_wiki_page_plural,
 => :label_board_plural
               }.freeze

0

app/views/wiki/show.rhtml +1 0

             <div class="contextual">
             <%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') if @content.version == @page.content.version %>
+            <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
             <%= link_to(l(:button_rollback), {:action => 'edit', :page => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
             <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
             <%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>

0

lang/bg.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Wiki редакция
             label_wiki_edit_plural: Wiki редакции
+            label_wiki_page_plural: Wiki pages
             label_page_index: Индекс
             label_current_version: Текуща версия
             label_preview: Преглед

0

lang/de.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Wiki Bearbeitung
             label_wiki_edit_plural: Wiki Bearbeitungen
+            label_wiki_page_plural: Wiki pages
             label_page_index: Index
             label_current_version: Gegenwärtige Version
             label_preview: Vorschau

0

lang/en.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
+            label_wiki_page_plural: Wiki pages
             label_page_index: Index
             label_current_version: Current version
             label_preview: Preview

0

lang/es.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
+            label_wiki_page_plural: Wiki pages
             label_page_index: Índice
             label_current_version: Versión actual
             label_preview: Previo

0

lang/fr.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Révision wiki
             label_wiki_edit_plural: Révisions wiki
+            label_wiki_page_plural: Pages wiki
             label_page_index: Index
             label_current_version: Version actuelle
             label_preview: Prévisualisation

0

lang/it.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Modifica Wiki
             label_wiki_edit_plural: Modfiche wiki
+            label_wiki_page_plural: Wiki pages
             label_page_index: Indice
             label_current_version: Versione corrente
             label_preview: Anteprima

0

lang/ja.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Wiki編集
             label_wiki_edit_plural: Wiki編集
+            label_wiki_page_plural: Wiki pages
             label_page_index: 索引
             label_current_version: 最新版
             label_preview: プレビュー

0

lang/nl.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
+            label_wiki_page_plural: Wiki pages
             label_page_index: Index
             label_current_version: Huidige versie
             label_preview: Testweergave

0

lang/pt-br.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
+            label_wiki_page_plural: Wiki pages
             label_page_index: Index
             label_current_version: Versao atual
             label_preview: Previa

0

lang/pt.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
+            label_wiki_page_plural: Wiki pages
             label_page_index: Index
             label_current_version: Versão atual
             label_preview: Prévia

0

lang/zh.yml +1 0

             label_wiki: Wiki
             label_wiki_edit: Wiki edit
             label_wiki_edit_plural: Wiki edits
+            label_wiki_page_plural: Wiki pages
             label_page_index: 索引
             label_current_version: 当前版本
             label_preview: 预览

0

test/unit/wiki_page_test.rb +10 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class WikiPageTest < Test::Unit::TestCase
-              fixtures :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions
+              fixtures :projects, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions
               def setup
                 @wiki = Wiki.find(1)
                 assert_kind_of WikiPage, page
                 assert page.new_record?
               end
+              def test_destroy
+                page = WikiPage.find(1)
+                page.destroy
+                assert_nil WikiPage.find_by_id(1)
+                # make sure that page content and its history are deleted
+                assert WikiContent.find_all_by_page_id(1).empty?
+                assert WikiContent.versioned_class.find_all_by_page_id(1).empty?
+              end
             end

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages