zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-27 fixed institution form for none SEB Admin roles

Browse source
This commit is contained in:
anhefti 2019-02-18 09:58:44 +01:00
parent fcad7a727b
commit d24bb080fb
2 changed files with 10 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/main/java/ch/ethz/seb/sebserver/gui/service/page/activity/ActivitiesPane.java
View file

@ -21,11 +21,13 @@ import org.eclipse.swt.widgets.TreeItem;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ch.ethz.seb.sebserver.gbl.model.EntityName; import ch.ethz.seb.sebserver.gbl.api.EntityType;
import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
import ch.ethz.seb.sebserver.gbl.model.user.UserRole; import ch.ethz.seb.sebserver.gbl.model.user.UserRole;
import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey;
import ch.ethz.seb.sebserver.gui.service.page.PageContext; import ch.ethz.seb.sebserver.gui.service.page.PageContext;
import ch.ethz.seb.sebserver.gui.service.page.PageContext.AttributeKeys;
import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer;
import ch.ethz.seb.sebserver.gui.service.page.action.ActionDefinition; import ch.ethz.seb.sebserver.gui.service.page.action.ActionDefinition;
import ch.ethz.seb.sebserver.gui.service.page.activity.ActivitySelection.Activity; import ch.ethz.seb.sebserver.gui.service.page.activity.ActivitySelection.Activity;
@ -88,11 +90,7 @@ public class ActivitiesPane implements TemplateComposer {
navigationGridData.horizontalIndent = 10; navigationGridData.horizontalIndent = 10;
navigation.setLayoutData(navigationGridData); navigation.setLayoutData(navigationGridData);
// final List<EntityName> insitutionNames = this.restService // institution
// .getBuilder(GetInstitutionNames.class)
// .call()
// .get(pageContext::notifyError, () -> Collections.emptyList());
if (userInfo.hasRole(UserRole.SEB_SERVER_ADMIN)) { if (userInfo.hasRole(UserRole.SEB_SERVER_ADMIN)) {
// institutions (list) as root // institutions (list) as root
final TreeItem institutions = this.widgetFactory.treeItemLocalized( final TreeItem institutions = this.widgetFactory.treeItemLocalized(
@ -100,17 +98,16 @@ public class ActivitiesPane implements TemplateComposer {
Activity.INSTITUTION_ROOT.title); Activity.INSTITUTION_ROOT.title);
injectActivitySelection(institutions, Activity.INSTITUTION_ROOT.createSelection()); injectActivitySelection(institutions, Activity.INSTITUTION_ROOT.createSelection());
// for (final EntityName inst : insitutionNames) {
// createInstitutionItem(institutions, inst);
// }
} else { } else {
// institution node as none root // institution node as none root
final TreeItem institutions = this.widgetFactory.treeItemLocalized( final TreeItem institutions = this.widgetFactory.treeItemLocalized(
navigation, navigation,
Activity.INSTITUTION_ROOT.title); Activity.INSTITUTION_NODE.title);
injectActivitySelection(institutions, Activity.INSTITUTION_NODE.createSelection()); injectActivitySelection(
// final EntityName inst = insitutionNames.iterator().next(); institutions,
// createInstitutionItem(navigation, inst); Activity.INSTITUTION_NODE.createSelection()
.withEntity(new EntityKey(userInfo.institutionId, EntityType.INSTITUTION))
.withAttribute(AttributeKeys.READ_ONLY, "true"));
} }
// final TreeItem user = this.widgetFactory.treeItemLocalized( // final TreeItem user = this.widgetFactory.treeItemLocalized(
@ -233,27 +230,6 @@ public class ActivitiesPane implements TemplateComposer {
} }
} }
static TreeItem createInstitutionItem(final Tree parent, final EntityName entityName) {
final TreeItem institution = new TreeItem(parent, SWT.NONE);
createInstitutionItem(entityName, institution);
return institution;
}
static TreeItem createInstitutionItem(final TreeItem parent, final EntityName entityName) {
final TreeItem institution = new TreeItem(parent, SWT.NONE);
createInstitutionItem(entityName, institution);
return institution;
}
static void createInstitutionItem(final EntityName entityName, final TreeItem institution) {
institution.setText(entityName.name);
injectActivitySelection(
institution,
Activity.INSTITUTION_NODE
.createSelection()
.withEntity(entityName.getEntityKey()));
}
static final TreeItem findItemByActivity( static final TreeItem findItemByActivity(
final TreeItem[] items, final TreeItem[] items,
final Activity activity, final Activity activity,

5
src/main/java/ch/ethz/seb/sebserver/gui/service/page/content/InstitutionForm.java
View file

@ -151,11 +151,6 @@ public class InstitutionForm implements TemplateComposer {
Domain.INSTITUTION.ATTR_LOGO_IMAGE, Domain.INSTITUTION.ATTR_LOGO_IMAGE,
"sebserver.institution.form.logoImage", "sebserver.institution.form.logoImage",
institution.logoImage, 2) institution.logoImage, 2)
.addEmptyCell()
.addTextField(
Domain.INSTITUTION.ATTR_URL_SUFFIX,
"sebserver.institution.form.urlSuffix",
institution.urlSuffix, 2)
.buildFor( .buildFor(
this.restService.getRestCall(SaveInstitution.class), this.restService.getRestCall(SaveInstitution.class),
InstitutionActions.postSaveAdapter(pageContext)); InstitutionActions.postSaveAdapter(pageContext));