From 50dbc60a5cefcf4a4c010c503fc8d8abc4569e41 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Thu, 10 Aug 2017 13:32:24 +0300
Subject: [PATCH] file/image should create link

---
 application/Espo/Core/Utils/Database/Orm/Converter.php     | 4 ++++
 .../Espo/Core/Utils/Database/Orm/Relations/Base.php        | 3 +--
 application/Espo/Resources/metadata/fields/file.json       | 7 ++++++-
 application/Espo/Resources/metadata/fields/image.json      | 7 ++++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/application/Espo/Core/Utils/Database/Orm/Converter.php b/application/Espo/Core/Utils/Database/Orm/Converter.php
index d636936ab7..408bdeb33a 100644
--- a/application/Espo/Core/Utils/Database/Orm/Converter.php
+++ b/application/Espo/Core/Utils/Database/Orm/Converter.php
@@ -406,6 +406,10 @@ class Converter
         $relationships = array();
         foreach ($entityMeta['links'] as $linkName => $linkParams) {
 
+            if (isset($linkParams['skipOrmDefs']) && $linkParams['skipOrmDefs'] === true) {
+                continue;
+            }
+
             $convertedLink = $this->getRelationManager()->convert($linkName, $linkParams, $entityName, $ormMeta);
 
             if (isset($convertedLink)) {
diff --git a/application/Espo/Core/Utils/Database/Orm/Relations/Base.php b/application/Espo/Core/Utils/Database/Orm/Relations/Base.php
index b89c50cab2..f993aa6ecb 100644
--- a/application/Espo/Core/Utils/Database/Orm/Relations/Base.php
+++ b/application/Espo/Core/Utils/Database/Orm/Relations/Base.php
@@ -45,8 +45,7 @@ class Base extends \Espo\Core\Utils\Database\Orm\Base
         'conditions',
         'additionalColumns',
         'midKeys',
-        'noJoin',
-        'noIndex'
+        'noJoin'
     );
 
     protected function getParams()
diff --git a/application/Espo/Resources/metadata/fields/file.json b/application/Espo/Resources/metadata/fields/file.json
index 47ae7a6598..b0ef47d625 100644
--- a/application/Espo/Resources/metadata/fields/file.json
+++ b/application/Espo/Resources/metadata/fields/file.json
@@ -21,5 +21,10 @@
    "notActualFields":[
       "name"
    ],
-   "filter": false
+   "filter": false,
+   "linkDefs": {
+      "type": "belongsTo",
+      "entity": "Attachment",
+      "skipOrmDefs": true
+   }
 }
diff --git a/application/Espo/Resources/metadata/fields/image.json b/application/Espo/Resources/metadata/fields/image.json
index 658ef6dab9..5c8ea3b1a7 100644
--- a/application/Espo/Resources/metadata/fields/image.json
+++ b/application/Espo/Resources/metadata/fields/image.json
@@ -22,5 +22,10 @@
    "notActualFields":[
       "name"
    ],
-   "filter": false
+   "filter": false,
+   "linkDefs": {
+      "type": "belongsTo",
+      "entity": "Attachment",
+      "skipOrmDefs": true
+   }
 }