From 9586b725add654126a3f3609418f9be3d55cdb8a Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Mon, 4 Dec 2017 16:58:52 +0200
Subject: [PATCH] fix return

---
 client/src/views/detail.js        | 3 +++
 client/src/views/edit.js          | 3 +++
 client/src/views/record/detail.js | 7 ++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/client/src/views/detail.js b/client/src/views/detail.js
index 5d53b4d14e..2f28566cde 100644
--- a/client/src/views/detail.js
+++ b/client/src/views/detail.js
@@ -103,6 +103,9 @@ Espo.define('views/detail', 'views/main', function (Dep) {
             this.optionsToPass.forEach(function (option) {
                 o[option] = this.options[option];
             }, this);
+            if (this.options.params && this.options.params.rootUrl) {
+                o.rootUrl = this.options.params.rootUrl;
+            }
             this.createView('record', this.getRecordViewName(), o);
         },
 
diff --git a/client/src/views/edit.js b/client/src/views/edit.js
index d44464dbe9..47c36caf41 100644
--- a/client/src/views/edit.js
+++ b/client/src/views/edit.js
@@ -69,6 +69,9 @@ Espo.define('views/edit', 'views/main', function (Dep) {
             this.optionsToPass.forEach(function (option) {
                 o[option] = this.options[option];
             }, this);
+            if (this.options.params && this.options.params.rootUrl) {
+                o.rootUrl = this.options.params.rootUrl;
+            }
             this.createView('record', this.getRecordViewName(), o);
         },
 
diff --git a/client/src/views/record/detail.js b/client/src/views/record/detail.js
index aee11747ae..ec41795cf8 100644
--- a/client/src/views/record/detail.js
+++ b/client/src/views/record/detail.js
@@ -1197,7 +1197,12 @@ Espo.define('views/record/detail', ['views/record/base', 'view-record-helper'],
         exitAfterCreate: function () {
             if (this.model.id) {
                 var url = '#' + this.scope + '/view/' + this.model.id;
-                this.getRouter().navigate(url, {trigger: true});
+
+                this.getRouter().navigate(url, {trigger: false});
+                this.getRouter().dispatch(this.scope, 'view', {
+                    id: this.model.id,
+                    rootUrl: this.options.rootUrl
+                });
                 return true;
             }
         },