Merge pull request #693 from metasfresh/dev-676

Process result: implement openDocument as modal #676
metasfresh · Apr 26, 2017 · 55ef2dc · 55ef2dc
2 parents 3e07487 + 9166cf1
commit 55ef2dc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -648,7 +648,8 @@ export function handleProcessResponse(response, type, id, successCallback) {
                             dispatch(
                                 openModal(
                                     '', action.windowId, 'window', null, null,
-                                    true, '', '', action.documentId
+                                    action.advanced ? action.advanced : false,
+                                    '', '', action.documentId
                                 )
                             );
                         } else {

diff --git a/src/components/Window.js b/src/components/Window.js
@@ -188,7 +188,7 @@ class Window extends Component {
     render() {
         const {sections, tabs} = this.props.layout;
         const {
-            handleDropFile, handleRejectDropped, handleDragStart
+            handleDropFile, handleRejectDropped, handleDragStart, isModal
         } = this.props;
 
         return (
@@ -202,10 +202,12 @@ class Window extends Component {
                         {sections && this.renderSections(sections)}
                     </div>
                 </Dropzone>
-
-                <div className="mt-1 tabs-wrapper">
-                    {tabs && this.renderTabs(tabs)}
-                </div>
+                {
+                    !isModal &&
+                    <div className="mt-1 tabs-wrapper">
+                        {tabs && this.renderTabs(tabs)}
+                    </div>
+                }
             </div>
         );
     }

diff --git a/src/components/app/Modal.js b/src/components/app/Modal.js
@@ -255,7 +255,7 @@ class Modal extends Component {
 
     renderPanel = () => {
         const {
-            data, modalTitle, modalType, isDocumentNotSaved
+            data, modalTitle, modalType, isDocumentNotSaved, layout
         } = this.props;
 
         const {
@@ -274,7 +274,7 @@ class Modal extends Component {
                     }
                 >
                     <span className="panel-modal-header-title">
-                        {modalTitle ? modalTitle : 'Modal'}
+                        {modalTitle ? modalTitle : layout.caption}
                     </span>
                     <div className="items-row-2">
                         <button