version

application/Espo/Core/Controllers/Record.php

@@ -224,7 +224,7 @@ class Record extends Base
 
     public function actionMassUpdate($params, $data, $request)
     {
-        if (!$request->isPost()) {
+        if (!$request->isPut()) {
             throw new BadRequest();
         }
 

application/Espo/Services/EmailTemplate.php

@@ -69,30 +69,14 @@ class EmailTemplate extends Record
                 'lower' => $params['emailAddress']
             ))->findOne();
 
+            $entity = $this->getEntityManager()->getRepository('EmailAddress')->getEntityByAddress($params['emailAddress']);
 
-            if (!empty($emailAddress)) {
-                $pdo = $this->getEntityManager()->getPDO();
-                $sql = "
-                    SELECT * FROM `entity_email_address`
-                    WHERE
-                        `primary` = 1 AND `deleted` = 0 AND `email_address_id` = " . $pdo->quote($emailAddress->id). "
-                ";
-                $sth = $pdo->prepare($sql);
-                $sth->execute();
-                while ($row = $sth->fetch()) {
-                    if (!empty($row['entity_id'])) {
-                        $entity = $this->getEntityManager()->getEntity($row['entity_type'], $row['entity_id']);
-                        if ($entity) {
-                            if ($entity instanceof Person) {
-                                $entityList['Person'] = $entity;
-                            }
-                            if (empty($entityList[$entity->getEntityName()])) {
-                                $entityList[$entity->getEntityName()] = $entity;
-                            }
-                            break;
-                        }
-
-                    }
+            if ($entity) {
+                if ($entity instanceof Person) {
+                    $entityList['Person'] = $entity;
+                }
+                if (empty($entityList[$entity->getEntityType()])) {
+                    $entityList[$entity->getEntityType()] = $entity;
                 }
             }
         }

frontend/client/src/views/fields/base.js

@@ -92,16 +92,20 @@ Espo.define('Views.Fields.Base', 'View', function (Dep) {
          * Hide field and label. Works only after rendered.
          */
         hide: function () {
-            this.$el.hide();
-            this.getCellElement().children('label').hide();
+            this.$el.addClass('hidden');
+            var $cell = this.getCellElement();
+            $cell.children('label').addClass('hidden');
+            $cell.addClass('hidden-cell');
         },
 
         /**
          * Show field and label. Works only after rendered.
          */
         show: function () {
-            this.$el.show();
-            this.getCellElement().children('label').show();
+            this.$el.removeClass('hidden');
+            var $cell = this.getCellElement();
+            $cell.children('label').removeClass('hidden');
+            $cell.removeClass('hidden-cell');
         },
 
         data: function () {
@@ -231,7 +235,7 @@ Espo.define('Views.Fields.Base', 'View', function (Dep) {
                     var initInlineEdit = function () {
 
                         var $cell = this.getCellElement();
-                        var $editLink = $('<a href="javascript:" class="pull-right inline-edit-link hide"><span class="glyphicon glyphicon-pencil"></span></a>');
+                        var $editLink = $('<a href="javascript:" class="pull-right inline-edit-link hidden"><span class="glyphicon glyphicon-pencil"></span></a>');
 
                         // sometimes field is being re-rendered in this time so need to init once again
                         if ($cell.size() == 0) {
@@ -251,12 +255,12 @@ Espo.define('Views.Fields.Base', 'View', function (Dep) {
                                 return;
                             }
                             if (this.mode == 'detail') {
-                                $editLink.removeClass('hide');
+                                $editLink.removeClass('hidden');
                             }
                         }.bind(this)).on('mouseleave', function (e) {
                             e.stopPropagation();
                             if (this.mode == 'detail') {
-                                $editLink.addClass('hide');
+                                $editLink.addClass('hidden');
                             }
                         }.bind(this));
                     }.bind(this);
@@ -367,7 +371,7 @@ Espo.define('Views.Fields.Base', 'View', function (Dep) {
             var $cell = this.getCellElement();
             $cell.find('.inline-save-link').remove();
             $cell.find('.inline-cancel-link').remove();
-            $cell.find('.inline-edit-link').addClass('hide');
+            $cell.find('.inline-edit-link').addClass('hidden');
         },
 
         addInlineEditLinks: function () {
@@ -376,7 +380,7 @@ Espo.define('Views.Fields.Base', 'View', function (Dep) {
             var $cancelLink = $('<a href="javascript:" class="pull-right inline-cancel-link">' + this.translate('Cancel') + '</a>').css('margin-left', '8px');
             $cell.prepend($saveLink);
             $cell.prepend($cancelLink);
-            $cell.find('.inline-edit-link').addClass('hide');
+            $cell.find('.inline-edit-link').addClass('hidden');
             $saveLink.click(function () {
                 this.inlineEditSave();
             }.bind(this));

frontend/client/src/views/fields/link-parent.js

@@ -43,7 +43,7 @@ Espo.define('Views.Fields.LinkParent', 'Views.Fields.Base', function (Dep) {
 
         autocompleteDisabled: false,
 
-        selectRecordsViewName: '',
+        selectRecordsViewName: 'Modals.SelectRecords',
 
         data: function () {
             return _.extend({
@@ -88,7 +88,7 @@ Espo.define('Views.Fields.LinkParent', 'Views.Fields.Base', function (Dep) {
                 this.addActionHandler('selectLink', function () {
                     this.notify('Loading...');
 
-                    var viewName = this.getMetadata().get('clientDefs.' + scope + '.modalViews.select') || this.selectRecordsViewName;
+                    var viewName = this.getMetadata().get('clientDefs.' + this.foreignScope + '.modalViews.select') || this.selectRecordsViewName;
 
                     this.createView('dialog', viewName, {
                         scope: this.foreignScope,

frontend/client/src/views/list.js

@@ -200,8 +200,7 @@ Espo.define('Views.List', ['Views.Main', 'SearchManager'], function (Dep, Search
             var attributes = this.getCreateAttributes() || {};
 
             router.dispatch(this.scope, 'create', {
-                attributes: attributes,
-                returnUrl: Backbone.history.fragment,
+                attributes: attributes
             });
             router.navigate(url, {trigger: false});
         }

frontend/client/src/views/record/base.js

@@ -36,8 +36,13 @@ Espo.define('Views.Record.Base', 'View', function (Dep) {
         fieldList: null,
 
         hideField: function (name) {
-            this.$el.find('label.field-label-' + name).addClass('hide');
-            this.$el.find('div.field-' + name).addClass('hide');
+            var $field = this.$el.find('div.field-' + name);
+            var $label = this.$el.find('label.field-label-' + name);
+
+            $field.addClass('hidden');
+            $label.addClass('hidden');
+            $field.closest('.cell-' + name).addClass('hidden-cell');
+
             var view = this.getFieldView(name);
             if (view) {
                 view.enabled = false;
@@ -45,8 +50,12 @@ Espo.define('Views.Record.Base', 'View', function (Dep) {
         },
 
         showField: function (name) {
-            this.$el.find('label.field-label-' + name).removeClass('hide');
-            this.$el.find('div.field-' + name).removeClass('hide');
+            var $field = this.$el.find('div.field-' + name);
+            var $label = this.$el.find('label.field-label-' + name);
+
+            $field.removeClass('hidden');
+            $label.removeClass('hidden');
+            $field.closest('.cell-' + name).removeClass('hidden-cell');
             var view = this.getFieldView(name);
             if (view) {
                 view.enabled = true;

frontend/less/espo/custom.less

@@ -48,6 +48,10 @@ blockquote {
   margin-bottom: 12px;
 }
 
+.form-group.hidden-cell {
+    margin-bottom: 0;
+}
+
 .panel-group .panel + .panel {
     margin-top: 4px;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "",
   "main": "index.php",
   "repository": {