X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.akb.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fakb%2Fui%2Fcomposites%2FItemTemplateTitleComposite.java;h=56c015c7ff984e66ab2b785423b9d73342aad550;hb=21fc32786fbec26c6fbc0097b2464e4d04eb1785;hp=d52b6ed1a76e92c00c5afced4a6ae9a17377eb6b;hpb=b331d1e6936fc825ee2565f423e7e249dbecb687;p=gpl%2Fargeo-slc.git diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/composites/ItemTemplateTitleComposite.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/composites/ItemTemplateTitleComposite.java index d52b6ed1a..56c015c7f 100644 --- a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/composites/ItemTemplateTitleComposite.java +++ b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/composites/ItemTemplateTitleComposite.java @@ -160,8 +160,8 @@ public class ItemTemplateTitleComposite extends Composite { Node newAlias = definedAliases.get(selIndex); // Only relies on the alias - itemNode.setProperty(AkbNames.AKB_USED_CONNECTOR, newAlias - .getProperty(Property.JCR_TITLE).getString()); + itemNode.setProperty(AkbNames.AKB_USED_CONNECTOR, + newAlias.getPath()); part.markDirty(); } catch (RepositoryException e) { throw new AkbException( @@ -217,9 +217,15 @@ public class ItemTemplateTitleComposite extends Composite { private int getCurrAliasIndex() { try { if (itemNode.hasProperty(AkbNames.AKB_USED_CONNECTOR)) { - String aliasName = itemNode.getProperty( + String aliasPath = itemNode.getProperty( AkbNames.AKB_USED_CONNECTOR).getString(); - return aliasCmb.indexOf(aliasName); + + if (!itemNode.getSession().nodeExists(aliasPath)) + return -1; + + Node alias = itemNode.getSession().getNode(aliasPath); + return aliasCmb.indexOf(alias.getProperty(Property.JCR_TITLE) + .getString()); } else return -1; } catch (RepositoryException re) {