jro_apps/redmine Commit - r4189:c514dd6885af

Jicamarca Repository

0

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

jro_apps » redmine

RSS

No TODOs yet

	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

                 flash[:error] = l(:notice_locking_conflict)
               end
-              verify :method => :post, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
+              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?
                 attachments = Attachment.attach_files(@page, params[:attachments])
                 render_attachment_warning_if_needed(@page)
-                redirect_to :action => 'show', :id => @page.title
+                redirect_to :action => 'show', :id => @page.title, :project_id => @project
               end
             private

                         when :local; "#{title}.html"
                         when :anchor; "##{title}"   # used for single-file wiki export
                         else
-                          url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, :id => Wiki.titleize(page), :anchor => anchor)
+                          wiki_page_id = page.present? ? Wiki.titleize(page) : nil
+                          url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, :id => wiki_page_id, :anchor => anchor)
                         end
                       link_to((title || page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else

                 <td class="description"><%=h version.description %></td>
                 <td class="status"><%= l("version_status_#{version.status}") %></td>
                 <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
-                <td><%= link_to(h(version.wiki_page_title), :controller => 'wiki', :id => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
+                <td><%= link_to(h(version.wiki_page_title), :controller => 'wiki', :action => 'show', :id => Wiki.titleize(version.wiki_page_title), :project_id => @project) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
                 <td class="buttons">
                 	<% if version.project == @project %>
                 		<%= link_to_if_authorized l(:button_edit),   {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %>

             <h3><%= format_date(date) %></h3>
             <ul>
             <% @pages_by_date[date].each do |page| %>
-                <li><%= link_to page.pretty_title, :action => 'show', :id => page.title %></li>
+                <li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %></li>
             <% end %>
             </ul>
             <% end %>

             <h2><%=h @page.pretty_title %></h2>
-            <% form_for :content, @content, :url => {:action => 'update', :id => @page.title}, :html => {:multipart => true, :id => 'wiki_form'} do |f| %>
+            <% form_for :content, @content, :url => {:action => 'update', :id => @page.title}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
             <%= f.hidden_field :version %>
             <%= error_messages_for 'content' %>
             <p><%= submit_tag l(:button_save) %>
                <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title },
-                                     :method => 'post',
+                                     :method => :post,
                                      :update => 'preview',
                                      :with => "Form.serialize('wiki_form')",
                                      :complete => "Element.scrollTo('preview')"

             <% line_num = 1 %>
             <% @versions.each do |ver| %>
             <tr class="<%= cycle("odd", "even") %>">
-                <td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :version => ver.version %></td>
+                <td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
                 <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
                 <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
                 <td align="center"><%= format_time(ver.updated_on) %></td>

             <%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
             </div>
-            <%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:id => parent.title}}) %>
+            <%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:id => parent.title, :project_id => parent.project}}) %>
             <% if @content.version != @page.content.version %>
                 <p>
-                <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :id => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
+                <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
                 <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
-                <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :id => @page.title, :version => @content.version) + ')' if @content.version > 1 %> -
+                <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :id => @page.title, :project_id => @page.project, :version => @content.version) + ')' if @content.version > 1 %> -
-                <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :id => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
+                <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
-                <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title) %>
+                <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
                 <br />
                 <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
                 <%=h @content.comments %>

@@ -27,27 +27,6 ActionController::Routing::Routes.draw do \|map\|
27	map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post}	27	map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post}
28	map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get}	28	map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get}
29	map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post}	29	map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post}
30	map.with_options :controller => 'wiki' do \|wiki_routes\|
31	wiki_routes.with_options :conditions => {:method => :get} do \|wiki_views\|
32	wiki_views.connect 'projects/:project_id/wiki/export', :action => 'export'
33	wiki_views.connect 'projects/:project_id/wiki/index', :action => 'index'
34	wiki_views.connect 'projects/:project_id/wiki/date_index', :action => 'date_index'
35	wiki_views.connect 'projects/:project_id/wiki/:id', :action => 'show', :id => nil
36	wiki_views.connect 'projects/:project_id/wiki/:id/edit', :action => 'edit'
37	wiki_views.connect 'projects/:project_id/wiki/:id/rename', :action => 'rename'
38	wiki_views.connect 'projects/:project_id/wiki/:id/history', :action => 'history'
39	wiki_views.connect 'projects/:project_id/wiki/:id/diff/:version/vs/:version_from', :action => 'diff'
40	wiki_views.connect 'projects/:project_id/wiki/:id/annotate/:version', :action => 'annotate'
41	end
42
43	wiki_routes.connect 'projects/:project_id/wiki/:id/:action',
44	:action => /rename\|preview\|protect\|add_attachment/,
45	:conditions => {:method => :post}
46
47	wiki_routes.connect 'projects/:project_id/wiki/:id/edit', :action => 'update', :conditions => {:method => :post}
48
49	wiki_routes.connect 'projects/:project_id/wiki/:id', :action => 'destroy', :conditions => {:method => :delete}
50	end
51		30
52	map.with_options :controller => 'messages' do \|messages_routes\|	31	map.with_options :controller => 'messages' do \|messages_routes\|
53	messages_routes.with_options :conditions => {:method => :get} do \|messages_views\|	32	messages_routes.with_options :conditions => {:method => :get} do \|messages_views\|
@@ -168,7 +147,21 ActionController::Routing::Routes.draw do \|map\|
168	project.resources :news, :shallow => true	147	project.resources :news, :shallow => true
169	project.resources :time_entries, :controller => 'timelog', :path_prefix => 'projects/:project_id'	148	project.resources :time_entries, :controller => 'timelog', :path_prefix => 'projects/:project_id'
170		149
171		150	project.wiki_start_page 'wiki', :controller => 'wiki', :action => 'show', :conditions => {:method => :get}
		151	project.wiki_index 'wiki/index', :controller => 'wiki', :action => 'index', :conditions => {:method => :get}
		152	project.wiki_diff 'wiki/:id/diff/:version/vs/:version_from', :controller => 'wiki', :action => 'diff'
		153	project.wiki_annotate 'wiki/:id/annotate/:version', :controller => 'wiki', :action => 'annotate'
		154	project.resources :wiki, :except => [:new, :create], :member => {
		155	:rename => [:get, :post],
		156	:history => :get,
		157	:preview => :any,
		158	:protect => :post,
		159	:add_attachment => :post
		160	}, :collection => {
		161	:export => :get,
		162	:date_index => :get
		163	}
		164
172	end	165	end
173		166
174	# Destroy uses a get request to prompt the user before the actual DELETE request	167	# Destroy uses a get request to prompt the user before the actual DELETE request

               def test_create_page
                 @request.session[:user_id] = 2
-                post :update, :project_id => 1,
+                put :update, :project_id => 1,
                             :id => 'New page',
                             :content => {:comments => 'Created the page',
                                          :text => "h1. New page\n\nThis is a new page",
                 @request.session[:user_id] = 2
                 assert_difference 'WikiPage.count' do
                   assert_difference 'Attachment.count' do
-                    post :update, :project_id => 1,
+                    put :update, :project_id => 1,
                                 :id => 'New page',
                                 :content => {:comments => 'Created the page',
                                              :text => "h1. New page\n\nThis is a new page",

                 should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'date_index', :project_id => '567'
                 should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :project_id => '567'
-                should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'update', :project_id => '567', :id => 'my_page'
                 should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :id => 'CookBook_documentation'
                 should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :id => 'ladida'
                 should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :id => 'ladida'
                 should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :id => 'ladida'
+                should_route :put, "/projects/567/wiki/my_page", :controller => 'wiki', :action => 'update', :project_id => '567', :id => 'my_page'
                 should_route :delete, "/projects/22/wiki/ladida", :controller => 'wiki', :action => 'destroy', :project_id => '22', :id => 'ladida'
               end

                   '[[Unknown page]]' => '<a href="/projects/ecookbook/wiki/Unknown_page" class="wiki-page new">Unknown page</a>',
                   '[[Unknown page|404]]' => '<a href="/projects/ecookbook/wiki/Unknown_page" class="wiki-page new">404</a>',
                   # link to another project wiki
-                  '[[onlinestore:]]' => '<a href="/projects/onlinestore/wiki/" class="wiki-page">onlinestore</a>',
+                  '[[onlinestore:]]' => '<a href="/projects/onlinestore/wiki" class="wiki-page">onlinestore</a>',
-                  '[[onlinestore:|Wiki]]' => '<a href="/projects/onlinestore/wiki/" class="wiki-page">Wiki</a>',
+                  '[[onlinestore:|Wiki]]' => '<a href="/projects/onlinestore/wiki" class="wiki-page">Wiki</a>',
                   '[[onlinestore:Start page]]' => '<a href="/projects/onlinestore/wiki/Start_page" class="wiki-page">Start page</a>',
                   '[[onlinestore:Start page|Text]]' => '<a href="/projects/onlinestore/wiki/Start_page" class="wiki-page">Text</a>',
                   '[[onlinestore:Unknown page]]' => '<a href="/projects/onlinestore/wiki/Unknown_page" class="wiki-page new">Unknown page</a>',