Merge pull request #648 from metasfresh/dev-645

HOME/END keys not working in process parameter field when opened from view #645
metasfresh · Apr 19, 2017 · 8ec435a · 8ec435a
2 parents 2498ea6 + 058d0eb
commit 8ec435a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -389,7 +389,7 @@ class DocumentList extends Component {
         const {
             windowType, open, closeOverlays, selected, inBackground,
             fetchQuickActionsOnInit, isModal, processStatus, readonly,
-            includedView, children, isIncluded
+            includedView, children, isIncluded, disablePaginationShortcuts
         } = this.props;
 
         const hasIncluded = layout && layout.supportIncludedView &&
@@ -477,6 +477,8 @@ class DocumentList extends Component {
                             queryLimitHit={data.queryLimitHit}
                             doesSelectionExist={this.doesSelectionExist}
                             inBackground={inBackground}
+                            disablePaginationShortcuts=
+                                {disablePaginationShortcuts}
                         >
                             {layout.supportAttributes && !isIncluded &&
                                 !layout.supportIncludedView &&

diff --git a/src/components/table/Table.js b/src/components/table/Table.js
@@ -703,7 +703,8 @@ class Table extends Component {
             cols, type, docId, rowData, tabid, readonly, size, handleChangePage,
             pageLength, page, mainTable, updateDocList, sort, orderBy,
             toggleFullScreen, fullScreen, tabIndex, indentSupported, isModal,
-            queryLimitHit, supportQuickInput, tabInfo, isIncluded
+            queryLimitHit, supportQuickInput, tabInfo, isIncluded,
+            disablePaginationShortcuts
         } = this.props;
 
         const {
@@ -825,6 +826,8 @@ class Table extends Component {
                                 deselect={this.deselectAllProducts}
                                 queryLimitHit={queryLimitHit}
                                 compressed={isIncluded}
+                                disablePaginationShortcuts=
+                                    {disablePaginationShortcuts}
                             />
                         </div>
                     </div>

diff --git a/src/components/table/TablePagination.js b/src/components/table/TablePagination.js
@@ -216,8 +216,10 @@ class TablePagination extends Component {
 
     render() {
         const {
-            size, pageLength, handleChangePage, page, compressed
+            size, pageLength, handleChangePage, page, compressed,
+            disablePaginationShortcuts
         } = this.props;
+
         const pages = size ? Math.ceil(size / pageLength) : 0;
 
         let pagination = [];
@@ -262,14 +264,18 @@ class TablePagination extends Component {
                     </div>
                 </div>
 
-                <PaginationContextShortcuts
-                    handleFirstPage={() => handleChangePage(1)}
-                    handleLastPage={() => handleChangePage(
-                        size ? Math.ceil(size / pageLength) : 0)
-                    }
-                    handleNextPage={() => handleChangePage('up')}
-                    handlePrevPage={() => handleChangePage('down')}
-                />
+                {
+                    !disablePaginationShortcuts &&
+                    <PaginationContextShortcuts
+                        handleFirstPage={() => handleChangePage(1)}
+                        handleLastPage={() => handleChangePage(
+                            size ? Math.ceil(size / pageLength) : 0)
+                        }
+                        handleNextPage={() => handleChangePage('up')}
+                        handlePrevPage={() => handleChangePage('down')}
+                    />
+
+                }
             </div>
         );
 

diff --git a/src/containers/DocList.js b/src/containers/DocList.js
@@ -141,6 +141,8 @@ class DocList extends Component {
                      inBackground={rawModal.visible}
                      fetchQuickActionsOnInit={true}
                      processStatus={processStatus}
+                     disablePaginationShortcuts=
+                        {modal.visible || rawModal.visible}
                  />
             </Container>
         );