![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 76eb73b)
raw | patch | inline | side by side (parent: 76eb73b)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 28 Jan 2010 08:54:54 +0000 (08:54 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 28 Jan 2010 08:54:54 +0000 (08:54 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15396 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/class_objectSelect.inc b/gosa-core/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
index e8e6130c26c6492ab83ccfdb3ef6dd3f014a1009..e90676e28c54c6d9b4c9a0ba93740ed4ce16ce42 100644 (file)
$this->config = $config;
$this->ui = $ui;
$this->storagePoints = array(
- "",
get_ou("userRDN"),
get_ou("groupRDN"),
get_ou("terminalRDN"),
diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
index 7e5ecf9591ef4e3ee0811492520e70ed2e569875..be500d5ced1e4e0e5a8ce7c8814a3a28bb2cc29f 100644 (file)
<search>
<query>
<backend>LDAPBlacklist</backend>
- <filter>(&(| $DEPARTMENT $USER $GROUP $SERVER $WORKSTATION $TERMINAL $PRINTER $PHONE ) $NAME)</filter>
+ <filter>(&(| $USER $GROUP $SERVER $WORKSTATION $TERMINAL $PRINTER $PHONE) $NAME)</filter>
+ <attribute>dn</attribute>
+ <attribute>objectClass</attribute>
+ <attribute>cn</attribute>
+ <attribute>sn</attribute>
+ <attribute>uid</attribute>
+ <attribute>givenName</attribute>
+ <attribute>description</attribute>
+ </query>
+ <query>
+ <backend>LDAPDepartmentBlacklist</backend>
+ <filter>(&(| $DEPARTMENT) $NAME)</filter>
<attribute>dn</attribute>
<attribute>objectClass</attribute>
<attribute>cn</attribute>
<maxlength>60</maxlength>
<default></default>
<unset></unset>
- <set>(|(cn=*$*)(sn=*$*)(givenName=*$*))</set>
+ <set>(|(cn=*$*)(sn=*$*)(givenName=*$*)(ou=*$*)(dc=*$*)(c=*$*)(l=*$*))</set>
<alphabet>true</alphabet>
<autocomplete>
<backend>LDAPBlacklist</backend>
- <filter>(&(|(objectClass=gosaDepartment)(objectClass=gosaAccount)(objectClass=posixGroup)(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal)(objectClass=gotoPrinter)(objectClass=goFonHardware))(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
+ <filter>(&(|(objectClass=gosaDepartment)(objectClass=gosaAccount)(objectClass=posixGroup)(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal)(objectClass=gotoPrinter)(objectClass=goFonHardware))(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)(ou=*$NAME*)(dc=*$NAME*)(c=*$NAME*)(l=*$NAME*)))</filter>
<attribute>cn</attribute>
+ <attribute>l</attribute>
+ <attribute>o</attribute>
+ <attribute>dc</attribute>
+ <attribute>c</attribute>
<frequency>0.5</frequency>
<characters>3</characters>
</autocomplete>
diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.tpl b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.tpl
index e15cf19b6f3f5e0e10813ff3359c3fd21baeb278..ced417586137af0065fb0e83f89d99104a336150 100644 (file)
<p class='separator'> </p>
<p style="text-align:right">
- <input type=submit name="userGroupSelect_save" value="{msgPool type=okButton}">
+ <input type=submit name="objectSelect_save" value="{msgPool type=okButton}">
- <input type=submit name="userGroupSelect_cancel" value="{msgPool type=cancelButton}">
+ <input type=submit name="objectSelect_cancel" value="{msgPool type=cancelButton}">
</p>
<input type="hidden" name="ignore">
diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.xml b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.xml
index 427dc1ee7b546c29c6aa9b1bc5e3d13b8a15ed28..27e68d887b0741db9751f8743b451a95eda705db 100644 (file)
<label>Please select the desired entries</label>
<defaultSortColumn>1</defaultSortColumn>
+ <objectType>
+ <label>Department</label>
+ <objectClass>gosaDepartment</objectClass>
+ <category>department</category>
+ <class>department</class>
+ <image>images/lists/folder.png</image>
+ </objectType>
+
+ <objectType>
+ <label>Server</label>
+ <objectClass>goServer</objectClass>
+ <category>server</category>
+ <class>servgeneric</class>
+ <image>plugins/systems/images/select_server.png</image>
+ </objectType>
+
+ <objectType>
+ <label>Workstation</label>
+ <objectClass>gotoWorkstation</objectClass>
+ <category>workstation</category>
+ <class>workgeneric</class>
+ <image>plugins/systems/images/select_workstation.png</image>
+ </objectType>
+
+ <objectType>
+ <label>Terminal</label>
+ <objectClass>gotoTerminal</objectClass>
+ <category>terminal</category>
+ <class>termgeneric</class>
+ <image>plugins/systems/images/select_terminal.png</image>
+ </objectType>
+
+ <objectType>
+ <label>Printer</label>
+ <objectClass>gotoPrinter</objectClass>
+ <category>printer</category>
+ <class>printGeneric</class>
+ <image>plugins/systems/images/select_printer.png</image>
+ </objectType>
+
+ <objectType>
+ <label>Phone</label>
+ <objectClass>goFonHardware</objectClass>
+ <category>phone</category>
+ <class>phoneGeneric</class>
+ <image>plugins/systems/images/select_phone.png</image>
+ </objectType>
+
<objectType>
<label>User</label>
<objectClass>gosaAccount</objectClass>