projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 695ad4c)
Merge branch '4.5' of https://github.com/civicrm/civicrm-core into 4.6
authorColeman Watts <coleman@civicrm.org>
Mon, 23 Mar 2015 20:29:31 +0000 (16:29 -0400)
committerColeman Watts <coleman@civicrm.org>
Mon, 23 Mar 2015 20:29:31 +0000 (16:29 -0400)
Conflicts:
js/Common.js

js/Common.js patch | blob | blame | history

diff --git a/js/Common.js b/js/Common.js
index b721e01c9de739c8f62022a96c9c3f47b1fb142e..4ad3867132e8da9256f2ce03a380bc4a2c797760 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -503,7 +503,7 @@ CRM.strings = CRM.strings || {};
             .on('click.crmEntity', 'a.crm-add-entity', function(e) {
               $el.select2('close');
               CRM.loadForm($(this).attr('href'), {
-                dialog: {width: 500, height: 'auto'}
+                dialog: {width: 500, height: 220}
               }).on('crmFormSuccess', function(e, data) {
                 if (data.status === 'success' && data.id) {
                   CRM.status(ts('%1 Created', {1: data.label}));