#526 Process from home menu works

metasfresh · Mar 21, 2017 · ac2006d · ac2006d
1 parent 62868c4
commit ac2006d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -498,7 +498,6 @@ export function createProcess(processType, viewId, type, ids, tabId, rowId) {
                 throw new Error('close_modal');
             }else{
                 dispatch(initDataSuccess(preparedData, 'modal'));
-
                 dispatch(initLayout('process', processType)).then(response => {
                     const preparedLayout = Object.assign({}, response.data, {
                         pinstanceId: pid

diff --git a/src/components/header/MenuOverlay.js b/src/components/header/MenuOverlay.js
@@ -186,7 +186,7 @@ class MenuOverlay extends Component {
 
     renderNaviagtion = (node) => {
         const {path} = this.state;
-        const {handleMenuOverlay} = this.props;
+        const {handleMenuOverlay, openModal} = this.props;
         return (
              <div
                 className="menu-overlay-container-column-wrapper js-menu-overlay"
@@ -209,6 +209,7 @@ class MenuOverlay extends Component {
                             parent={node}
                             back={e => this.handleClickBack(e)}
                             handleMenuOverlay={handleMenuOverlay}
+                            openModal={openModal}
                             {...item}
                         />
                     )}

diff --git a/src/containers/DocList.js b/src/containers/DocList.js
@@ -96,8 +96,8 @@ class DocList extends Component {
                         rawModalVisible={rawModal.visible}
                         indicator={indicator}
                         isDocumentNotSaved={
-                            !modal.saveStatus.saved &&
-                            !modal.validStatus.initialValue
+                            (modal.saveStatus && !modal.saveStatus.saved) &&
+                            (modal.validStatus && !modal.validStatus.initialValue)
                         }
                      />
                  }

diff --git a/src/containers/MasterWindow.js b/src/containers/MasterWindow.js
@@ -148,8 +148,8 @@ class MasterWindow extends Component {
                         rawModalVisible={rawModal.visible}
                         indicator={indicator}
                         isDocumentNotSaved={
-                            !modal.saveStatus.saved &&
-                            !modal.validStatus.initialValue
+                            (modal.saveStatus && !modal.saveStatus.saved) &&
+                            (modal.validStatus && !modal.validStatus.initialValue)
                         }
                      />
                  }