Skip to content
Snippets Groups Projects
Commit 1792843c authored by uhensler's avatar uhensler
Browse files

OO-3117: Show master identification in metadata panel, wording

parent 1cb1dbc5
No related branches found
No related tags found
No related merge requests found
...@@ -121,10 +121,12 @@ menu.database.favorit=Meine Favoriten ...@@ -121,10 +121,12 @@ menu.database.favorit=Meine Favoriten
menu.database.favorit.alt=Meine Favoriten menu.database.favorit.alt=Meine Favoriten
menu.database.my=Meine Fragen menu.database.my=Meine Fragen
menu.database.my.alt=Meine Fragen menu.database.my.alt=Meine Fragen
menu.final=Final
menu.pools=Pool menu.pools=Pool
menu.pools.alt=Pool menu.pools.alt=Pool
menu.pools.main=Katalog menu.pools.main=Katalog
menu.pools.main.alt=Katalog menu.pools.main.alt=Katalog
menu.review=Beurteilung
menu.share=Freigaben menu.share=Freigaben
metadatas=Metadaten metadatas=Metadaten
metadata.show=Metadaten anzeigen metadata.show=Metadaten anzeigen
......
...@@ -77,7 +77,7 @@ public class TechnicalMetadataEditController extends FormBasicController { ...@@ -77,7 +77,7 @@ public class TechnicalMetadataEditController extends FormBasicController {
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) { protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
uifactory.addStaticTextElement("general.identifier", item.getIdentifier(), formLayout); uifactory.addStaticTextElement("general.identifier", item.getIdentifier(), formLayout);
uifactory.addStaticTextElement("general.master.identifier", "", formLayout); uifactory.addStaticTextElement("general.master.identifier", item.getMasterIdentifier(), formLayout);
editorEl = uifactory.addStaticTextElement("technical.editor", "", formLayout); editorEl = uifactory.addStaticTextElement("technical.editor", "", formLayout);
......
...@@ -93,7 +93,6 @@ public class BusinessGroupTreeNode extends GenericTreeNode implements Controller ...@@ -93,7 +93,6 @@ public class BusinessGroupTreeNode extends GenericTreeNode implements Controller
return roles != null && return roles != null &&
( roles.isOLATAdmin() ( roles.isOLATAdmin()
|| roles.isPoolAdmin() || roles.isPoolAdmin()
//TODO uh Muss dieses statemant innerhalb der Klammern sein? dh role haben
|| businessGroupService.isIdentityInBusinessGroup(identity, group.getKey(), true, false, null) || businessGroupService.isIdentityInBusinessGroup(identity, group.getKey(), true, false, null)
); );
} }
......
...@@ -93,7 +93,6 @@ public class PoolTreeNode extends GenericTreeNode implements ControllerTreeNode ...@@ -93,7 +93,6 @@ public class PoolTreeNode extends GenericTreeNode implements ControllerTreeNode
( roles.isOLATAdmin() ( roles.isOLATAdmin()
|| roles.isPoolAdmin() || roles.isPoolAdmin()
|| pool.isPublicPool() || pool.isPublicPool()
//TODO uh Muss dieses statemant innerhalb der Klammern sein? dh role haben
|| qpoolService.isOwner(identity, pool) || qpoolService.isOwner(identity, pool)
); );
} }
......
...@@ -139,7 +139,9 @@ public class QuestionPoolMenuTreeModel extends GenericTreeModel implements DnDTr ...@@ -139,7 +139,9 @@ public class QuestionPoolMenuTreeModel extends GenericTreeModel implements DnDTr
} }
public void reloadReviewCounts() { public void reloadReviewCounts() {
reloadReviewCount(reviewNode); if (reviewNode != null) {
reloadReviewCount(reviewNode);
}
} }
private void reloadReviewCount(INode node) { private void reloadReviewCount(INode node) {
......
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