Skip to content
Snippets Groups Projects
Commit 463c97a5 authored by srosse's avatar srosse
Browse files

OO-633: fix remove of a deleted group in the table model

parent a72cd75d
No related branches found
No related tags found
No related merge requests found
...@@ -274,7 +274,7 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle ...@@ -274,7 +274,7 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle
BusinessGroup businessGroup = businessGroupService.loadBusinessGroup(businessGroupKey); BusinessGroup businessGroup = businessGroupService.loadBusinessGroup(businessGroupKey);
//prevent rs after a group is deleted by someone else //prevent rs after a group is deleted by someone else
if(businessGroup == null) { if(businessGroup == null) {
groupListModel.removeBusinessGroup(businessGroup); groupListModel.removeBusinessGroup(businessGroupKey);
groupListCtr.modelChanged(); groupListCtr.modelChanged();
} else if(TABLE_ACTION_DELETE.equals(actionid)) { } else if(TABLE_ACTION_DELETE.equals(actionid)) {
BGTableItem item = groupListModel.getObject(te.getRowId()); BGTableItem item = groupListModel.getObject(te.getRowId());
......
...@@ -34,7 +34,6 @@ import org.olat.core.gui.components.table.DefaultTableDataModel; ...@@ -34,7 +34,6 @@ import org.olat.core.gui.components.table.DefaultTableDataModel;
import org.olat.core.gui.translator.Translator; import org.olat.core.gui.translator.Translator;
import org.olat.core.util.Formatter; import org.olat.core.util.Formatter;
import org.olat.core.util.filter.FilterFactory; import org.olat.core.util.filter.FilterFactory;
import org.olat.group.BusinessGroup;
import org.olat.group.BusinessGroupMembership; import org.olat.group.BusinessGroupMembership;
/** /**
...@@ -173,10 +172,12 @@ public class BusinessGroupTableModelWithType extends DefaultTableDataModel<BGTab ...@@ -173,10 +172,12 @@ public class BusinessGroupTableModelWithType extends DefaultTableDataModel<BGTab
setObjects(owned); setObjects(owned);
} }
public void removeBusinessGroup(BusinessGroup bg) { public void removeBusinessGroup(Long bgKey) {
if(bgKey == null) return;
for(int i=objects.size(); i-->0; ) { for(int i=objects.size(); i-->0; ) {
BGTableItem wrapped = (BGTableItem)objects.get(i); BGTableItem wrapped = (BGTableItem)objects.get(i);
if(bg.getKey().equals(wrapped.getBusinessGroupKey())) { if(bgKey.equals(wrapped.getBusinessGroupKey())) {
objects.remove(i); objects.remove(i);
return; return;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment