From 16ce5385f4e806bfb49ff6a264c00b03a4612f72 Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Mon, 2 Mar 2015 12:24:57 +0200
Subject: [PATCH] campaign dev

---
 .../Crm/Entities/CampaignLogRecord.php        | 28 +++++++++++++++++
 .../Crm/Resources/i18n/en_US/Campaign.json    |  2 +-
 ...ampaignLog.json => CampaignLogRecord.json} |  0
 .../layouts/Campaign/relationships.json       |  2 +-
 .../metadata/clientDefs/Campaign.json         |  9 +++++-
 .../metadata/entityDefs/Campaign.json         |  4 +--
 ...ampaignLog.json => CampaignLogRecord.json} |  2 +-
 ...ampaignLog.json => CampaignLogRecord.json} |  0
 .../{detail-side.js => detail-bottom.js}      |  7 -----
 .../crm/src/views/campaign/record/detail.js   |  2 +-
 .../record/panels/campaign-log-records.js     | 31 +++++++++++++++++++
 11 files changed, 73 insertions(+), 14 deletions(-)
 create mode 100644 application/Espo/Modules/Crm/Entities/CampaignLogRecord.php
 rename application/Espo/Modules/Crm/Resources/i18n/en_US/{CampaignLog.json => CampaignLogRecord.json} (100%)
 rename application/Espo/Modules/Crm/Resources/metadata/entityDefs/{CampaignLog.json => CampaignLogRecord.json} (97%)
 rename application/Espo/Modules/Crm/Resources/metadata/scopes/{CampaignLog.json => CampaignLogRecord.json} (100%)
 rename frontend/client/modules/crm/src/views/campaign/record/{detail-side.js => detail-bottom.js} (89%)
 create mode 100644 frontend/client/modules/crm/src/views/campaign/record/panels/campaign-log-records.js

diff --git a/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php b/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php
new file mode 100644
index 0000000000..6b9e3924de
--- /dev/null
+++ b/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php
@@ -0,0 +1,28 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+namespace Espo\Modules\Crm\Entities;
+
+class CampaignLogRecord extends \Espo\Core\ORM\Entity
+{
+
+}
diff --git a/application/Espo/Modules/Crm/Resources/i18n/en_US/Campaign.json b/application/Espo/Modules/Crm/Resources/i18n/en_US/Campaign.json
index 355ac04544..28cec9b58b 100644
--- a/application/Espo/Modules/Crm/Resources/i18n/en_US/Campaign.json
+++ b/application/Espo/Modules/Crm/Resources/i18n/en_US/Campaign.json
@@ -14,7 +14,7 @@
         "contacts": "Contacts",
         "leads": "Leads",
         "opportunities": "Opportunities",
-        "campaignLogs": "Log"
+        "campaignLogRecords": "Log"
     },
     "options": {
         "type": {
diff --git a/application/Espo/Modules/Crm/Resources/i18n/en_US/CampaignLog.json b/application/Espo/Modules/Crm/Resources/i18n/en_US/CampaignLogRecord.json
similarity index 100%
rename from application/Espo/Modules/Crm/Resources/i18n/en_US/CampaignLog.json
rename to application/Espo/Modules/Crm/Resources/i18n/en_US/CampaignLogRecord.json
diff --git a/application/Espo/Modules/Crm/Resources/layouts/Campaign/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Campaign/relationships.json
index 41b42e677b..a0ca8ee9e9 100644
--- a/application/Espo/Modules/Crm/Resources/layouts/Campaign/relationships.json
+++ b/application/Espo/Modules/Crm/Resources/layouts/Campaign/relationships.json
@@ -1,3 +1,3 @@
 [
-
+	"campaignLogRecords"
 ]
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json
index 20bc56ad43..79999e7878 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json
@@ -16,7 +16,14 @@
     "recordViews": {
       "detail": "Crm:Campaign.Record.Detail"
     },
-   "presetFilters": [
+    "relationshipPanels": {
+      "campaignLogRecords": {
+        "view": "Crm:Campaign.Record.Panels.CampaignLogRecords",
+        "select": false,
+        "create": false
+      }
+    },
+    "presetFilters": [
       {
          "name":"active",
          "style": "primary",
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Campaign.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Campaign.json
index 5c25d3d14a..f9214048a8 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Campaign.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Campaign.json
@@ -93,9 +93,9 @@
             "entity": "Opportunity",
             "foreign": "campaign"
         },
-        "campaignLogs": {
+        "campaignLogRecords": {
             "type": "hasMany",
-            "entity": "CampaignLog",
+            "entity": "CampaignLogRecord",
             "foreign": "campaign"
         }
     },
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/CampaignLog.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/CampaignLogRecord.json
similarity index 97%
rename from application/Espo/Modules/Crm/Resources/metadata/entityDefs/CampaignLog.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/CampaignLogRecord.json
index f2772ce92b..0aac3853d6 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/CampaignLog.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/CampaignLogRecord.json
@@ -44,7 +44,7 @@
         "campaign": {
             "type": "belongsTo",
             "entity": "Campaign",
-            "foreign": "campaignLogs"
+            "foreign": "campaignLogRecords"
         },
         "parent": {
             "type": "belongsToParent",
diff --git a/application/Espo/Modules/Crm/Resources/metadata/scopes/CampaignLog.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/CampaignLogRecord.json
similarity index 100%
rename from application/Espo/Modules/Crm/Resources/metadata/scopes/CampaignLog.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/CampaignLogRecord.json
diff --git a/frontend/client/modules/crm/src/views/campaign/record/detail-side.js b/frontend/client/modules/crm/src/views/campaign/record/detail-bottom.js
similarity index 89%
rename from frontend/client/modules/crm/src/views/campaign/record/detail-side.js
rename to frontend/client/modules/crm/src/views/campaign/record/detail-bottom.js
index 12b8995956..8700adcd79 100644
--- a/frontend/client/modules/crm/src/views/campaign/record/detail-side.js
+++ b/frontend/client/modules/crm/src/views/campaign/record/detail-bottom.js
@@ -24,13 +24,6 @@ Espo.define('Crm:Views.Campaign.Record.DetailBottom', 'Views.Record.DetailBottom
 
     return Dep.extend({
 
-        setup: function () {
-        	Dep.prototype.setup.call(this);
-
-        	this.panels.unshift({
-        		
-        	});
-        }
 
     });
 });
diff --git a/frontend/client/modules/crm/src/views/campaign/record/detail.js b/frontend/client/modules/crm/src/views/campaign/record/detail.js
index 644a91753f..92ba40c115 100644
--- a/frontend/client/modules/crm/src/views/campaign/record/detail.js
+++ b/frontend/client/modules/crm/src/views/campaign/record/detail.js
@@ -24,7 +24,7 @@ Espo.define('Crm:Views.Campaign.Record.Detail', 'Views.Record.Detail', function
 
     return Dep.extend({
 
-        bottomView: 'Crm:Campaign.Record.DetailSide',
+        bottomView: 'Crm:Campaign.Record.DetailBottom',
 
     });
 });
diff --git a/frontend/client/modules/crm/src/views/campaign/record/panels/campaign-log-records.js b/frontend/client/modules/crm/src/views/campaign/record/panels/campaign-log-records.js
new file mode 100644
index 0000000000..cb11d450eb
--- /dev/null
+++ b/frontend/client/modules/crm/src/views/campaign/record/panels/campaign-log-records.js
@@ -0,0 +1,31 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+
+Espo.define('Crm:Views.Campaign.Record.Panels.CampaignLogRecords', 'Views.Record.Panels.Relationship', function (Dep) {
+
+    return Dep.extend({
+
+
+    });
+});
+
+