Merge pull request #694 from metasfresh/dev-676

Provide documentId instead of NEW, disable tabs queried in modal #676
metasfresh · Apr 27, 2017 · 6a82804 · 6a82804
2 parents 44e72a4 + 6e5312c
commit 6a82804
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -300,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
+                        ))
+                    }
                 })
         });
     }

diff --git 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}