Mercurial > hg > soundsoftware-site
diff app/views/projects/settings/.svn/text-base/_versions.rhtml.svn-base @ 37:94944d00e43c
* Update to SVN trunk rev 4411
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Fri, 19 Nov 2010 13:24:41 +0000 |
| parents | 40f7cfd4df19 |
| children |
line wrap: on
line diff
--- a/app/views/projects/settings/.svn/text-base/_versions.rhtml.svn-base Fri Sep 24 14:06:04 2010 +0100 +++ b/app/views/projects/settings/.svn/text-base/_versions.rhtml.svn-base Fri Nov 19 13:24:41 2010 +0000 @@ -6,7 +6,7 @@ <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> @@ -17,7 +17,7 @@ <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', :page => Wiki.titleize(version.wiki_page_title)) 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' %>