#448 Fix for data structure

metasfresh · Mar 2, 2017 · 466f768 · 466f768
1 parent 2672389
commit 466f768
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -228,10 +228,11 @@ export function createWindow(windowType, docId = 'NEW', tabId, rowId, isModal =
 
                             if(index === 0 || !tab.queryOnActivate){
                                 dispatch(getTab(tab.tabid, windowType, docId)).then(res => {
-                                tabTmp[tab.tabid] = res;
-                            })}
+                                    tabTmp[tab.tabid] = res;
+                                    dispatch(addRowData(tabTmp, getScope(isModal)));
+                                })
+                            }
 
-                            dispatch(addRowData(tabTmp, getScope(isModal)));
                         }
                     )
             }).catch((err) => {

diff --git a/src/components/tabs/Tab.js b/src/components/tabs/Tab.js
@@ -16,7 +16,7 @@ class Tab extends Component {
 
         if(queryOnActivate){
             dispatch(getTab(tabid, windowType, docId)).then(res => {
-                dispatch(addRowData(res, 'master'));
+                dispatch(addRowData({[tabid]: res}, 'master'));
             });
         }
     }