OSDN Git Service
(root)
/
elecoma
/
elecoma.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
97a2008
)
refs #1610 マージミスを修正
author
YOSHIDA Hiroki
<hyoshida@appirits.com>
Fri, 14 Jun 2013 10:00:43 +0000
(19:00 +0900)
committer
YOSHIDA Hiroki
<hyoshida@appirits.com>
Fri, 14 Jun 2013 10:01:33 +0000
(19:01 +0900)
app/models/mail_magazine.rb
patch
|
blob
|
history
diff --git
a/app/models/mail_magazine.rb
b/app/models/mail_magazine.rb
index
075abc6
..
5ecfc3b
100644
(file)
--- a/
app/models/mail_magazine.rb
+++ b/
app/models/mail_magazine.rb
@@
-122,7
+122,7
@@
and c.activate = 2
"and #{MergeAdapterUtil.concat('c.family_name', 'c.first_name')} like ? "
end}
#{unless condition.customer_name_kana.blank?
- condition << "%#{condition.customer_name_kana}%"
+ condition
s
<< "%#{condition.customer_name_kana}%"
"and #{MergeAdapterUtil.concat('c.family_name_kana', 'c.first_name_kana')} like ? "
end}
#{if condition.sex_male == "1" && condition.sex_female == "0"