fix portal account contact select acl

api/v1/portal-access/web.config

@@ -5,8 +5,8 @@
         <rewrite>
             <rules>
                 <rule name="rule 1G" stopProcessing="true">
-					<match url="^"  />
-					<action type="Rewrite" url="index.php"  appendQueryString="true" />
+                    <match url="^"  />
+                    <action type="Rewrite" url="index.php"  appendQueryString="true" />
 				</rule>
             </rules>
         </rewrite>

application/Espo/Core/Acl/Table.php

@@ -175,7 +175,7 @@ class Table
     public function getLevel($scope, $action)
     {
         if (isset($this->data->table->$scope)) {
-            if (isset($this->table->$scope->$action)) {
+            if (isset($this->data->table->$scope->$action)) {
                 return $this->data->table->$scope->$action;
             }
         }

application/Espo/Modules/Crm/Controllers/Opportunity.php

@@ -25,7 +25,7 @@
  *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Modules\Crm\Controllers;
 
@@ -43,10 +43,10 @@ class Opportunity extends \Espo\Core\Controllers\Record
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-                
+
         return $this->getService('Opportunity')->reportByLeadSource($dateFrom, $dateTo);
     }
-    
+
     public function actionReportByStage($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
@@ -56,10 +56,10 @@ class Opportunity extends \Espo\Core\Controllers\Record
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-        
+
         return $this->getService('Opportunity')->reportByStage($dateFrom, $dateTo);
     }
-    
+
     public function actionReportSalesByMonth($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
@@ -69,10 +69,10 @@ class Opportunity extends \Espo\Core\Controllers\Record
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-                
-        return $this->getService('Opportunity')->reportSalesByMonth($dateFrom, $dateTo);        
+
+        return $this->getService('Opportunity')->reportSalesByMonth($dateFrom, $dateTo);
     }
-    
+
     public function actionReportSalesPipeline($params, $data, $request)
     {
         $level = $this->getAcl()->getLevel('Opportunity', 'read');
@@ -82,7 +82,7 @@ class Opportunity extends \Espo\Core\Controllers\Record
 
         $dateFrom = $request->get('dateFrom');
         $dateTo = $request->get('dateTo');
-        
+
         return $this->getService('Opportunity')->reportSalesPipeline($dateFrom, $dateTo);
     }
 }

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Case.json

@@ -12,7 +12,7 @@
              {
                 "name":"activities",
                 "label":"Activities",
-                "view":"crm:views/record/panels/activities",
+                "view":"crm:views/case/record/panels/activities",
                 "aclScope": "Activities"
              },
              {

application/Espo/Modules/Crm/Resources/metadata/scopes/Account.json

@@ -3,7 +3,7 @@
     "layouts": true,
     "tab": true,
     "acl": true,
-    "aclPortal": "recordAllAccountOwnNo",
+    "aclPortal": "recordAllAccountNo",
     "module": "Crm",
     "customizable": true,
     "stream": true,

application/Espo/Modules/Crm/Resources/metadata/scopes/Contact.json

@@ -3,7 +3,7 @@
 	"layouts":true,
 	"tab":true,
 	"acl":true,
-    "aclPortal": "recordAllAccountContactOwnNo",
+    "aclPortal": "recordAllAccountContactNo",
 	"module":"Crm",
     "customizable": true,
     "stream": true,

application/Espo/Modules/Crm/SelectManagers/Account.php

@@ -52,5 +52,22 @@ class Account extends \Espo\Core\SelectManagers\Base
         );
     }
 
+    protected function accessPortalOnlyAccount(&$result)
+    {
+        $d = array();
+
+        $accountIdList = $this->getUser()->getLinkMultipleIdList('accounts');
+
+        if (count($accountIdList)) {
+            $result['whereClause'][] = array(
+                'id' => $accountIdList
+            );
+        } else {
+            $result['whereClause'][] = array(
+                'id' => null
+            );
+        }
+    }
+
  }
 

application/Espo/Modules/Crm/SelectManagers/Contact.php

@@ -44,5 +44,22 @@ class Contact extends \Espo\Core\SelectManagers\Base
         ), $result);
     }
 
+    protected function accessPortalOnlyContact(&$result)
+    {
+        $d = array();
+
+        $contactId = $this->getUser()->get('contactId');
+
+        if ($contactId) {
+            $result['whereClause'][] = array(
+                'id' => $contactId
+            );
+        } else {
+            $result['whereClause'][] = array(
+                'id' => null
+            );
+        }
+    }
+
  }
 

application/Espo/Services/InboundEmail.php

@@ -421,6 +421,7 @@ class InboundEmail extends \Espo\Services\Record
 
         if ($user) {
             $case->set('assignedUserId', $user->id);
+            $case->set('status', 'Assigned');
         }
     }
 
@@ -437,6 +438,7 @@ class InboundEmail extends \Espo\Services\Record
 
         if ($user) {
             $case->set('assignedUserId', $user->id);
+            $case->set('status', 'Assigned');
         }
     }
 
@@ -468,19 +470,17 @@ class InboundEmail extends \Espo\Services\Record
             $caseDistribution = $params['caseDistribution'];
         }
 
-
-
         $targetUserPosition = null;
         if (!empty($params['targetUserPosition'])) {
             $targetUserPosition = $params['targetUserPosition'];
         }
 
-        $case->set('status', 'Assigned');
 
         switch ($caseDistribution) {
             case 'Direct-Assignment':
                 if ($userId) {
                     $case->set('assignedUserId', $userId);
+                    $case->set('status', 'Assigned');
                 }
                 break;
             case 'Round-Robin':

client/modules/crm/src/views/case/record/panels/activities.js

@@ -24,31 +24,31 @@
  *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/
 
-Espo.define('Crm:Views.Case.Record.Panels.Activities', 'Crm:Views.Record.Panels.Activities', function (Dep) {
+Espo.define('crm:views/case/record/panels/activities', 'crm:views/record/panels/activities', function (Dep) {
 
     return Dep.extend({
-        
+
         getComposeEmailAttributes: function (data, callback) {
             data = data || {};
             var attributes = {
                 status: 'Draft',
                 name: '[#' + this.model.get('number') + '] ' + this.model.get('name')
             };
-            
+
             if (this.model.get('contactId')) {
                 this.getModelFactory().create('Contact', function (contact) {
                     contact.id = this.model.get('contactId');
-                    
+
                     this.listenToOnce(contact, 'sync', function () {
-                        var emailAddress = contact.get('emailAddress');                        
+                        var emailAddress = contact.get('emailAddress');
                         if (emailAddress) {
                             attributes.to = emailAddress;
                         }
-                        
+
                         callback.call(this, attributes);
-                    });                    
+                    });
                     contact.fetch({
                         error: function () {
                             callback.call(this, attributes);
@@ -58,8 +58,7 @@ Espo.define('Crm:Views.Case.Record.Panels.Activities', 'Crm:Views.Record.Panels.
             } else {
                 callback.call(this, attributes);
             }
-        },
-        
+        }
     });
 });
 

frontend/html/portal.html

@@ -37,7 +37,7 @@
                         id: '{{portalId}}',
                         useCache: false,
                         cacheTimestamp: {{cacheTimestamp}},
-                        url: 'api/v1/portal/{{portalId}}',
+                        url: 'api/v1/portal-access/{{portalId}}',
                         basePath: '{{basePath}}'
                     }, function (app) {
                         {{runScript}}

html/portal.html

@@ -18,7 +18,7 @@
                         id: '{{portalId}}',
                         useCache: {{useCache}},
                         cacheTimestamp: {{cacheTimestamp}},
-                        url: 'api/v1/portal/{{portalId}}',
+                        url: 'api/v1/portal-access/{{portalId}}',
                         basePath: '{{basePath}}'
                     }, function (app) {
                         {{runScript}}

package.json

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