summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b4131d1)
raw | patch | inline | side by side (parent: b4131d1)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Wed, 19 May 2010 08:45:21 +0000 (08:45 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Wed, 19 May 2010 08:45:21 +0000 (08:45 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18543 594d385d-05f5-0310-b6e9-bd551577e9d8
gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc | patch | blob | history | |
gosa-core/plugins/addons/propertyEditor/property-list.tpl | patch | blob | history |
diff --git a/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc b/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc
index 4800151f7c29304750d2c0282f7499c0259e3b5c..d8d26e04351165c840021ba6874183b3b7469250 100644 (file)
$smarty = get_smarty();
$smarty->assign("warningNotAccepted", $this->warningNotAccepted);
+ $smarty->assign("ignoreLdapProperties", $this->config->configRegistry->ignoreLdapProperties);
return(management::execute());
}
diff --git a/gosa-core/plugins/addons/propertyEditor/property-list.tpl b/gosa-core/plugins/addons/propertyEditor/property-list.tpl
index 0a4ccb2f25f1d52d7d8ca7c595ae5801a41a2bc9..b5c16e2ad660733ba45ccf0a7fe30f69a95c4029 100644 (file)
<div id="mainlist">
<div class="mainlist-header">
- <p>{$HEADLINE} {$SIZELIMIT}</p>
+ <p>{$HEADLINE} {$SIZELIMIT}
+ {if $ignoreLdapProperties}
+ - <font color='red'>{t}Ignoring LDAP defined properties !{/t}</font>
+ {/if}
+ </p>
<div class="mainlist-nav">
<table summary="{$HEADLINE}">
<tr>