Provide documentId instead of NEW, disable tabs queried in modal #676

metasfresh · Apr 27, 2017 · 6e5312c · 6e5312c
1 parent 34e5963
commit 6e5312c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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}