Skip to content
Snippets Groups Projects
Commit 3e695acf authored by Andrew8xx8's avatar Andrew8xx8
Browse files

Notes fixed

parent e3351287
No related branches found
No related tags found
No related merge requests found
GIT
remote: https://github.com/ctran/annotate_models.git
revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e
specs:
annotate (2.6.0.beta1)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
GIT
remote: https://github.com/gitlabhq/raphael-rails.git
revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
specs:
raphael-rails (2.1.0)
GIT GIT
remote: https://github.com/gollum/gollum.git remote: https://github.com/gollum/gollum.git
revision: 5dcd3c8c8f68158e43ff79861279088ee56d0ebe revision: 5dcd3c8c8f68158e43ff79861279088ee56d0ebe
Loading
@@ -15,20 +29,6 @@ GIT
Loading
@@ -15,20 +29,6 @@ GIT
stringex (~> 1.5.1) stringex (~> 1.5.1)
useragent (~> 0.4.16) useragent (~> 0.4.16)
   
GIT
remote: https://github.com/ctran/annotate_models.git
revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e
specs:
annotate (2.6.0.beta1)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
GIT
remote: https://github.com/gitlabhq/raphael-rails.git
revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
specs:
raphael-rails (2.1.0)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
Loading
Loading
Loading
@@ -259,6 +259,10 @@ class Event < ActiveRecord::Base
Loading
@@ -259,6 +259,10 @@ class Event < ActiveRecord::Base
target.noteable_type == "Commit" target.noteable_type == "Commit"
end end
   
def note_project_snippet?
target.noteable_type == "Snippet"
end
def note_target def note_target
target.noteable target.noteable
end end
Loading
Loading
Loading
@@ -170,4 +170,10 @@ class Note < ActiveRecord::Base
Loading
@@ -170,4 +170,10 @@ class Note < ActiveRecord::Base
"wall" "wall"
end end
end end
# FIXME: Hack for polymorphic associations with STI
# For more information wisit http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#label-Polymorphic+Associations
def noteable_type=(sType)
super(sType.to_s.classify.constantize.base_class.to_s)
end
end end
Loading
@@ -20,6 +20,7 @@ class Snippet < ActiveRecord::Base
Loading
@@ -20,6 +20,7 @@ class Snippet < ActiveRecord::Base
attr_accessible :title, :content, :file_name, :expires_at, :private attr_accessible :title, :content, :file_name, :expires_at, :private
   
belongs_to :author, class_name: "User" belongs_to :author, class_name: "User"
has_many :notes, as: :noteable, dependent: :destroy has_many :notes, as: :noteable, dependent: :destroy
   
delegate :name, :email, to: :author, prefix: true, allow_nil: true delegate :name, :email, to: :author, prefix: true, allow_nil: true
Loading
Loading
Loading
@@ -5,6 +5,10 @@
Loading
@@ -5,6 +5,10 @@
- if event.note_commit? - if event.note_commit?
= event.note_target_type = event.note_target_type
= link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id" = link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id"
- if event.note_project_snippet?
= link_to project_snippet_path(event.project, event.note_target) do
%strong
#{event.note_target_type} ##{truncate event.note_target_id}
- else - else
= link_to [event.project, event.note_target] do = link_to [event.project, event.note_target] do
%strong %strong
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment