jro_apps/redmine Commit - r5302:6db0e8dcef0b

34

class WikiController < ApplicationController

34

class WikiController < ApplicationController

35

default_search_scope :wiki_pages

35

default_search_scope :wiki_pages

36

before_filter :find_wiki, :authorize

36

before_filter :find_wiki, :authorize

37

before_filter :find_existing_or_new_page, :only => [:show, :edit, :update]

37

before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]

38

before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]

38

39

verify :method => :post, :only => [:protect], :redirect_to => { :action => :show }

40

41

helper :attachments

40

helper :attachments

42

include AttachmentsHelper

41

include AttachmentsHelper

43

helper :watchers

42

helper :watchers

56

55

57

# display a page (in editing mode if it doesn't exist)

56

# display a page (in editing mode if it doesn't exist)

58

def show

57

def show

59

page_title = params[:id]

60

@page = @wiki.find_or_new_page(page_title)

61

if @page.new_record?

58

if @page.new_record?

62

if User.current.allowed_to?(:edit_wiki_pages, @project) && editable?

59

if User.current.allowed_to?(:edit_wiki_pages, @project) && editable?

63

edit

60

edit

89

86

90

# edit an existing page or a new one

87

# edit an existing page or a new one

91

def edit

88

def edit

92

@page = @wiki.find_or_new_page(params[:id])

93

return render_403 unless editable?

89

return render_403 unless editable?

94

@page.content = WikiContent.new(:page => @page) if @page.new_record?

90

@page.content = WikiContent.new(:page => @page) if @page.new_record?

95

91

105

verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }

101

verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }

106

# Creates a new page or updates an existing one

102

# Creates a new page or updates an existing one

107

def update

103

def update

108

@page = @wiki.find_or_new_page(params[:id])

109

return render_403 unless editable?

104

return render_403 unless editable?

110

@page.content = WikiContent.new(:page => @page) if @page.new_record?

105

@page.content = WikiContent.new(:page => @page) if @page.new_record?

111

106

151

end

146

end

152

end

147

end

153

148

149

verify :method => :post, :only => :protect, :redirect_to => { :action => :show }

154

def protect

150

def protect

155

@page.update_attribute :protected, params[:protected]

151

@page.update_attribute :protected, params[:protected]

156

redirect_to :action => 'show', :project_id => @project, :id => @page.title

152

redirect_to :action => 'show', :project_id => @project, :id => @page.title

250

render_404

246

render_404

251

end

247

end

252

248

249

# Finds the requested page or a new page if it doesn't exist

250

def find_existing_or_new_page

251

@page = @wiki.find_or_new_page(params[:id])

252

end

253

# Finds the requested page and returns a 404 error if it doesn't exist

254

# Finds the requested page and returns a 404 error if it doesn't exist

254

def find_existing_page

255

def find_existing_page

255

@page = @wiki.find_page(params[:id])

256

@page = @wiki.find_page(params[:id])

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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

             class WikiController < ApplicationController
               default_search_scope :wiki_pages
               before_filter :find_wiki, :authorize
+              before_filter :find_existing_or_new_page, :only => [:show, :edit, :update]
               before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
-              verify :method => :post, :only => [:protect], :redirect_to => { :action => :show }
               helper :attachments
               include AttachmentsHelper
               helper :watchers
               # display a page (in editing mode if it doesn't exist)
               def show
-                page_title = params[:id]
-                @page = @wiki.find_or_new_page(page_title)
                 if @page.new_record?
                   if User.current.allowed_to?(:edit_wiki_pages, @project) && editable?
                     edit
               # edit an existing page or a new one
               def edit
-                @page = @wiki.find_or_new_page(params[:id])
                 return render_403 unless editable?
                 @page.content = WikiContent.new(:page => @page) if @page.new_record?
               verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
               # Creates a new page or updates an existing one
               def update
-                @page = @wiki.find_or_new_page(params[:id])
                 return render_403 unless editable?
                 @page.content = WikiContent.new(:page => @page) if @page.new_record?
                 end
               end
+              verify :method => :post, :only => :protect, :redirect_to => { :action => :show }
               def protect
                 @page.update_attribute :protected, params[:protected]
                 redirect_to :action => 'show', :project_id => @project, :id => @page.title
                 render_404
               end
+              # Finds the requested page or a new page if it doesn't exist
+              def find_existing_or_new_page
+                @page = @wiki.find_or_new_page(params[:id])
+              end
               # Finds the requested page and returns a 404 error if it doesn't exist
               def find_existing_page
                 @page = @wiki.find_page(params[:id])