jro_apps/redmine Commit - r703:fdf842a4c458

Improved Redmine links:...

Jean-Philippe Lang -

r703:fdf842a4c458

parent child

Context file:

r703:fdf842a4c458

Collapse all files

app/helpers/application_helper.rb +19 -3

                      page = title || $2
                      title = $1 if page.blank?
                    end
-                   link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)), :class => 'wiki-page')
+                   if link_project && link_project.wiki
+                     # check if page exists
+                     wiki_page = link_project.wiki.find_page(page)
+                     link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)),
+                                              :class => ('wiki-page' + (wiki_page ? '' : ' new')))
+                   else
+                     # project or wiki doesn't exist
+                     title || page
+                   end
                  end
                  # turn issue and revision ids into links
                    leading, otype, oid = $1, $2, $3
                    link = nil
                    if otype == 'r'
-                     link = link_to("r#{oid}", {:controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid}, :class => 'changeset') if project
+                     if project && (changeset = project.changesets.find_by_revision(oid))
+                       link = link_to("r#{oid}", {:controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid}, :class => 'changeset',
+                                                 :title => truncate(changeset.comments, 100))
+                     end
                    else
-                     link = link_to("##{oid}", {:controller => 'issues', :action => 'show', :id => oid}, :class => 'issue')
+                     if issue = Issue.find_by_id(oid.to_i, :include => [:project, :status], :conditions => Project.visible_by(User.current))
+                       link = link_to("##{oid}", {:controller => 'issues', :action => 'show', :id => oid}, :class => 'issue',
+                                                 :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
+                       link = content_tag('del', link) if issue.closed?
+                     end
                    end
                    leading + (link || "#{otype}#{oid}")
                  end

app/models/project.rb +1 0

                has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
                has_many :boards, :order => "position ASC"
                has_one :repository, :dependent => :destroy
+               has_many :changesets, :through => :repository
                has_one :wiki, :dependent => :destroy
                has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
                acts_as_tree :order => "name", :counter_cache => true

app/views/projects/_form.rhtml +1 -1

              <%= hidden_field_tag "wiki_enabled", 0 %>
              <div id="wiki">
              <% fields_for :wiki, @project.wiki, { :builder => TabularFormBuilder, :lang => current_language} do |wiki| %>
-             <p><%= wiki.text_field :start_page, :size => 60, :required => true %><br /><em><%= l(:text_unallowed_characters) %>: , . / ? ; |</em></p>
+             <p><%= wiki.text_field :start_page, :size => 60, :required => true %><br /><em><%= l(:text_unallowed_characters) %>: , . / ? ; : |</em></p>
              <% # content_tag("div", "", :id => "wiki_start_page_auto_complete", :class => "auto_complete") +
                 # auto_complete_field("wiki_start_page", { :url => { :controller => 'wiki', :action => 'auto_complete_for_wiki_page', :id => @project } })
              %>

app/views/wiki/_content.rhtml +1 -3

              <div class="wiki">
-               <% cache "wiki/show/#{content.page.id}/#{content.version}" do %>
-                 <%= textilizable content.text, :attachments => content.page.attachments %>
-               <% end %>
+               <%= textilizable content.text, :attachments => content.page.attachments %>
              </div>

public/images/external.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

public/stylesheets/application.css +5 -1

              div.wiki a {
                  background-position: 0% 60%;
                  background-repeat: no-repeat;
-                 padding-left: 14px;
+                 padding-left: 12px;
                  background-image: url(../images/external.png);
              }
                  background-image: none;
              }
+             div.wiki a.new {
+                 color: #b73535;
+             }
              div.wiki code {
                  font-size: 1.2em;
              }

test/unit/helpers/application_helper_test.rb +8 -5

              class ApplicationHelperTest < HelperTestCase
                include ApplicationHelper
-               fixtures :projects
+               include ActionView::Helpers::TextHelper
+               fixtures :projects, :repositories, :changesets, :trackers, :issue_statuses, :issues
                def setup
                  super
                end
                def test_redmine_links
-                 issue_link = link_to('#52', {:controller => 'issues', :action => 'show', :id => 52}, :class => 'issue')
-                 changeset_link = link_to('r19', {:controller => 'repositories', :action => 'revision', :id => 1, :rev => 19}, :class => 'changeset')
+                 issue_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3},
+                                            :class => 'issue', :title => 'Error 281 when updating a recipe (New)')
+                 changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 1, :rev => 1},
+                                                :class => 'changeset', :title => 'My very first commit')
                  to_test = {
-                   '#52, #52 and #52.' => "#{issue_link}, #{issue_link} and #{issue_link}.",
-                   'r19' => changeset_link
+                   '#3, #3 and #3.' => "#{issue_link}, #{issue_link} and #{issue_link}.",
+                   'r1' => changeset_link
                  }
                  @project = Project.find(1)
                  to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }

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