[#19] remove unneeded code

This commit is contained in:
Alexander Machehin 2013-04-10 02:21:02 +06:00
parent 8066c7144c
commit 94d7865f14
2 changed files with 4 additions and 11 deletions

View File

@ -4,7 +4,7 @@ class Comment < ActiveRecord::Base
# User/Project#Num
# User#Num
# #Num
ISSUES_REGEX = /(?:[a-zA-Z0-9\-_]*\/)?(?:[a-zA-Z0-9\-_]*)?[#!][0-9]+/
ISSUES_REGEX = /(?:[a-zA-Z0-9\-_]*\/)?(?:[a-zA-Z0-9\-_]*)?#[0-9]+/
belongs_to :commentable, :polymorphic => true, :touch => true
belongs_to :user
@ -157,14 +157,7 @@ class Comment < ActiveRecord::Base
elements.each do |element|
element[1].scan(ISSUES_REGEX).each do |hash|
delimiter = if hash.include? '!'
'!'
elsif hash.include? '#'
'#'
else
raise "Unknown delimiter for the hash tag ( #{hash} )"
end
issue = Issue.find_by_hash_tag hash, current_ability, item.project, delimiter
issue = Issue.find_by_hash_tag hash, current_ability, item.project
next unless issue
# dont create link to the same issue
next if opts[:created_from_issue_id] == issue.id

View File

@ -67,8 +67,8 @@ class Issue < ActiveRecord::Base
recipients
end
def self.find_by_hash_tag hash_tag, current_ability, project, delimiter = '#'
hash_tag =~ /([a-zA-Z0-9\-_]*\/)?([a-zA-Z0-9\-_]*)?#{delimiter}([0-9]+)/
def self.find_by_hash_tag hash_tag, current_ability, project
hash_tag =~ /([a-zA-Z0-9\-_]*\/)?([a-zA-Z0-9\-_]*)?#([0-9]+)/
owner_uname = Regexp.last_match[1].presence || Regexp.last_match[2].presence || project.owner.uname
project_name = Regexp.last_match[1] ? Regexp.last_match[2] : project.name
serial_id = Regexp.last_match[3]