From 34e5963bbe87fc72f7a8f534ebdf3e1c5863f385 Mon Sep 17 00:00:00 2001
From: Katarzyna Dunikowska <katarzyna.dunikowska@jazzy.pro>
Date: Wed, 26 Apr 2017 16:32:35 +0200
Subject: [PATCH 1/2] work in progress

---
 src/actions/WindowActions.js | 2 ++
 src/components/app/Modal.js  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
index f5b262f51..866b3af43 100644
--- a/src/actions/WindowActions.js
+++ b/src/actions/WindowActions.js
@@ -240,6 +240,7 @@ export function selectTableItems(ids, windowType) {
 export function createWindow(
     windowType, docId = 'NEW', tabId, rowId, isModal = false, isAdvanced
 ) {
+    console.log(docId);
     return (dispatch) => {
         if (docId == 'new') {
             docId = 'NEW';
@@ -625,6 +626,7 @@ export function createProcess(processType, viewId, type, ids, tabId, rowId) {
 }
 
 export function handleProcessResponse(response, type, id, successCallback) {
+    console.log('handleProcessResponse');
     return (dispatch) => {
         const {
             error, summary, action
diff --git a/src/components/app/Modal.js b/src/components/app/Modal.js
index 5d55e325d..53e768a95 100644
--- a/src/components/app/Modal.js
+++ b/src/components/app/Modal.js
@@ -91,6 +91,8 @@ class Modal extends Component {
             relativeType, isAdvanced, modalViewId, modalViewDocumentIds
         } = this.props;
 
+        console.log('modal');
+
         switch(modalType){
             case 'window':
                 dispatch(createWindow(

From 6e5312ca14d577e300a4e5e3e8f05bf6cda8d2f8 Mon Sep 17 00:00:00 2001
From: katarzynadunikowska <katarzyna.dunikowska@jazzy.pro>
Date: Thu, 27 Apr 2017 12:23:29 +0200
Subject: [PATCH 2/2] Provide documentId instead of NEW, disable tabs queried
 in modal #676

---
 src/actions/WindowActions.js | 10 +++++-----
 src/components/app/Modal.js  |  2 --
 src/containers/DocList.js    |  1 +
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
index 866b3af43..d5138927e 100644
--- a/src/actions/WindowActions.js
+++ b/src/actions/WindowActions.js
@@ -240,7 +240,6 @@ export function selectTableItems(ids, windowType) {
 export function createWindow(
     windowType, docId = 'NEW', tabId, rowId, isModal = false, isAdvanced
 ) {
-    console.log(docId);
     return (dispatch) => {
         if (docId == 'new') {
             docId = 'NEW';
@@ -301,9 +300,11 @@ export function createWindow(
                         response.data, getScope(isModal)
                     ))
                 ).then(response => {
-                    dispatch(initTabs(
-                        response.layout.tabs, windowType, docId, isModal
-                    ))
+                    if(!isModal){
+                        dispatch(initTabs(
+                            response.layout.tabs, windowType, docId, isModal
+                        ))
+                    }
                 })
         });
     }
@@ -626,7 +627,6 @@ export function createProcess(processType, viewId, type, ids, tabId, rowId) {
 }
 
 export function handleProcessResponse(response, type, id, successCallback) {
-    console.log('handleProcessResponse');
     return (dispatch) => {
         const {
             error, summary, action
diff --git a/src/components/app/Modal.js b/src/components/app/Modal.js
index 53e768a95..5d55e325d 100644
--- a/src/components/app/Modal.js
+++ b/src/components/app/Modal.js
@@ -91,8 +91,6 @@ class Modal extends Component {
             relativeType, isAdvanced, modalViewId, modalViewDocumentIds
         } = this.props;
 
-        console.log('modal');
-
         switch(modalType){
             case 'window':
                 dispatch(createWindow(
diff --git a/src/containers/DocList.js b/src/containers/DocList.js
index 4ab6f996d..5de58f897 100644
--- a/src/containers/DocList.js
+++ b/src/containers/DocList.js
@@ -88,6 +88,7 @@ class DocList extends Component {
                 {modal.visible &&
                     <Modal
                         windowType={modal.type}
+                        dataId={modal.dataId ? modal.dataId : ''}
                         data={modal.data}
                         layout={modal.layout}
                         rowData={modal.rowData}