jro_apps/redmine Commit - r4193:c91ca4fcd91f

Fix wikilinks in project > settings > versions and version view. #6435 #4416...

Jean-Baptiste Barth -

r4193:c91ca4fcd91f

parent child

Context file:

r4193:c91ca4fcd91f

Collapse all files

app/views/projects/settings/_versions.rhtml +2 -2

             <% if @project.shared_versions.any? %>
             <table class="list versions">
             	<thead><tr>
                 <th><%= l(:label_version) %></th>
                 <th><%= l(:field_effective_date) %></th>
                 <th><%= l(:field_description) %></th>
                 <th><%= l(:field_status) %></th>
                 <th><%= l(:field_sharing) %></th>
-                <th><%= l(:label_wiki_page) unless @project.wiki.nil? %></th>
+                <th><%= l(:label_wiki_page) %></th>
                 <th style="width:15%"></th>
                 </tr></thead>
             	<tbody>
             <% for version in @project.shared_versions.sort %>
                 <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
                 <td class="name"><%= link_to_version version %></td>
                 <td class="date"><%= format_date(version.effective_date) %></td>
                 <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', :action => 'show', :id => Wiki.titleize(version.wiki_page_title), :project_id => @project) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
+                <td><%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.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' %>
                 		<%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
                 	<% end %>
                	</td>
                 </tr>
             <% end; reset_cycle %>
                 </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <div class="contextual">
             <% if @project.versions.any? %>
             	<%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %>
             <% end %>
             </div>
             <p><%= link_to_if_authorized l(:label_version_new), :controller => 'versions', :action => 'new', :project_id => @project %></p>

app/views/versions/show.rhtml +1 -1

             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
-            <%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @project.wiki.nil? %>
+            <%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :project_id => @version.project, :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %>
             <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
             </div>
             <h2><%= h(@version.name) %></h2>
             <div id="version-summary">
             <% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
             <fieldset><legend><%= l(:label_time_tracking) %></legend>
             <table>
             <tr>
                 <td width="130px" align="right"><%= l(:field_estimated_hours) %></td>
                 <td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(l_hours(@version.estimated_hours)) %></td>
             </tr>
             <% if User.current.allowed_to?(:view_time_entries, @project) %>
             <tr>
                 <td width="130px" align="right"><%= l(:label_spent_time) %></td>
                 <td width="240px" class="total-hours"><%= html_hours(l_hours(@version.spent_hours)) %></td>
             </tr>
             <% end %>
             </table>
             </fieldset>
             <% end %>
             <div id="status_by">
             <%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
             </div>
             </div>
             <div id="roadmap">
             <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
             <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
             <% if @issues.present? %>
             <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
             <ul>
             <% @issues.each do |issue| -%>
                 <li><%= link_to_issue(issue) %></li>
             <% end -%>
             </ul>
             </fieldset>
             <% end %>
             </div>
             <%= call_hook :view_versions_show_bottom, :version => @version %>
             <% html_title @version.name %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

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