Merge branch 'dev'
Conflicts: app/helpers/dashboard_helper.rb
This commit is contained in:
commit
fe1433c379
22 changed files with 211 additions and 211 deletions
|
@ -12,7 +12,7 @@ module DashboardHelper
|
|||
when "Commit" then project_commit_path(project, :id => note.noteable_id)
|
||||
else wall_project_path(project)
|
||||
end
|
||||
else "#"
|
||||
else wall_project_path(project)
|
||||
end
|
||||
rescue
|
||||
"#"
|
||||
|
@ -24,8 +24,8 @@ module DashboardHelper
|
|||
title = case klass
|
||||
when "Note" then markdown(object.note)
|
||||
when "Issue" then object.title
|
||||
when "Commit" then object.safe_message
|
||||
else ""
|
||||
when "Grit::Commit" then object.safe_message
|
||||
else return "Project Wall"
|
||||
end
|
||||
|
||||
"[#{klass}] #{truncate(sanitize(title, :tags => []), :length => 60)} "
|
||||
|
|
|
@ -1,2 +1,12 @@
|
|||
module IssuesHelper
|
||||
def sort_class
|
||||
if can?(current_user, :admin_issue, @project) && (!params[:f] || params[:f] == "0")
|
||||
"handle"
|
||||
end
|
||||
end
|
||||
|
||||
def project_issues_filter_path project, params = {}
|
||||
params[:f] ||= cookies['issue_filter']
|
||||
project_issues_path project, params
|
||||
end
|
||||
end
|
||||
|
|
15
app/helpers/tags_helper.rb
Normal file
15
app/helpers/tags_helper.rb
Normal file
|
@ -0,0 +1,15 @@
|
|||
module TagsHelper
|
||||
def tag_path tag
|
||||
"/tags/#{tag}"
|
||||
end
|
||||
|
||||
def tag_list project
|
||||
html = ''
|
||||
project.tag_list.each do |tag|
|
||||
html += link_to tag, tag_path(tag)
|
||||
end
|
||||
|
||||
html.html_safe
|
||||
end
|
||||
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue