Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Development
Core
Commits
a3801280
Commit
a3801280
authored
Mar 24, 2016
by
colemanw
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8021 from JKingsnorth/CRM-18288
CRM-18288: Fix mergeBlock JS for location types
parents
c4b857d6
d9b043a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
templates/CRM/Contact/Form/Merge.tpl
templates/CRM/Contact/Form/Merge.tpl
+1
-1
No files found.
templates/CRM/Contact/Form/Merge.tpl
View file @
a3801280
...
...
@@ -227,7 +227,7 @@
// If the location was changed, lookup the type if it exists
if
(
type
==
'
locTypeId
'
)
{
locTypeId
=
element
.
value
;
typeTypeId
=
CRM
.
$
(
'
select#
type
_
'
+
blockname
+
'
_
'
+
blockId
+
'
_typeTypeId
'
).
val
();
typeTypeId
=
CRM
.
$
(
'
select#
location
_
'
+
blockname
+
'
_
'
+
blockId
+
'
_typeTypeId
'
).
val
();
}
// Otherwise the type was changed, lookup the location if it exists
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment