Index: ../../branches/magnolia-4.3/magnolia-core/src/main/java/info/magnolia/freemarker/models/ContentModel.java =================================================================== --- ../../branches/magnolia-4.3/magnolia-core/src/main/java/info/magnolia/freemarker/models/ContentModel.java (revision 32667) +++ ../../branches/magnolia-4.3/magnolia-core/src/main/java/info/magnolia/freemarker/models/ContentModel.java (revision ) @@ -88,17 +88,19 @@ public TemplateModel get(String key) throws TemplateModelException { final Object result; + try { - if (key.equals("@handle")) { - result = content.getHandle(); - } else if (key.equals("@uuid")) { - result = content.getUUID(); - } else if (key.equals("@name")) { - result = content.getName(); + if (key.equals("@handle")) { + result = content.getHandle(); + } else if (key.equals("@uuid")) { + result = content.getUUID(); + } else if (key.equals("@name")) { + result = content.getName(); + } else if (key.equals("@level") || key.equals("@depth")) { + result = content.getLevel(); - } else if (key.equalsIgnoreCase("metaData")) { - result = content.getMetaData(); - } else { - // try for node data or child node + } else if (key.equalsIgnoreCase("metaData")) { + result = content.getMetaData(); + } else { + // try for node data or child node - try { if (content.hasNodeData(key)) { result = content.getNodeData(key); } else { @@ -108,10 +110,10 @@ result = null; } } + } - } catch (RepositoryException e) { - throw new TemplateModelException(e); - } + } catch (RepositoryException e) { + throw new TemplateModelException(e); + } - } return wrapper.wrap(result); }