Commit e664ce80 authored by Steffen Michels's avatar Steffen Michels

fix problems with instructions in group containers

git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/trunk@1114 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent 15848d15
......@@ -80,7 +80,8 @@ itasks.ttc.GroupContainer = Ext.extend(Ext.Panel,{
window.destroy();
Ext.state.Manager.set(group.taskId + '_' + idx + '_behaviour', 'GBFixed');
group.createContainer(cont, 'GBFixed', idx, true);
group.showAllMenuItems(cont.getTopToolbar());
if (cont.getXType() == 'itasks.ttc.form' || cont.getXType() == 'itasks.ttc.message')
group.showAllMenuItems(cont.getTopToolbar());
group.renderFixed();
}
}];
......@@ -333,10 +334,18 @@ itasks.ttc.GroupContainer = Ext.extend(Ext.Panel,{
});
this.renderFixed();
if (this.focusedContainer && this.focusedContainer.get(0).getTopToolbar().items.length > 0) {
// toolbar of focused container has been updated, copy changes to shared toolbar
this.mkSharedTbar(this.focusedContainer);
}
if (this.focusedContainer) {
var cont = this.focusedContainer.get(0);
if (
(cont.getXType() == 'itasks.ttc.form' || cont.getXType() == 'itasks.ttc.message') &&
cont.getTopToolbar().items.length > 0
) {
// toolbar of focused container has been updated, copy changes to shared toolbar
this.mkSharedTbar(this.focusedContainer);
}
}
// focus containers for which focus commands have been sent
if (Ext.isDefined(focusFixed))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment