diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index c703ab0cecec9c066d29506809c9ba74e99c1e3d..606f2b08fb4dee51187920c2a27015c9c2a184f9 100644 (file)
<definition>
<departmentBrowser>true</departmentBrowser>
<departmentRootVisible>false</departmentRootVisible>
<definition>
<departmentBrowser>true</departmentBrowser>
<departmentRootVisible>false</departmentRootVisible>
+ <baseMode>true</baseMode>
<multiSelect>true</multiSelect>
<template>user-list.tpl</template>
<module>users</module>
<label>List of users</label>
<multiSelect>true</multiSelect>
<template>user-list.tpl</template>
<module>users</module>
<label>List of users</label>
+ <defaultSortColumn>1</defaultSortColumn>
<objectType>
<objectType>
- <objectClass>gosaAccount</objectClass>
- <image>plugins/users/images/select_user.png</image>
- <priority>2</priority>
+ <label>Template</label>
+ <objectClass>gosaUserTemplate</objectClass>
+ <category>users</category>
+ <class>user</class>
+ <image>plugins/users/images/select_template.png</image>
</objectType>
<objectType>
</objectType>
<objectType>
- <objectClass>gosaUserTemplate</objectClass>
- <priority>1</priority>
- <image>plugins/users/images/select_template.png</image>
+ <label>User</label>
+ <objectClass>gosaAccount</objectClass>
+ <category>users</category>
+ <class>user</class>
+ <image>plugins/users/images/select_user.png</image>
</objectType>
</definition>
<table>
</objectType>
</definition>
<table>
- <layout>|20px||145px|80px;r|</layout>
+ <layout>|20px;c||||150px|180px;r|</layout>
+
+ <department>
+ <value>%{filter:objectType(dn,objectClass)}</value>
+ </department>
+
+ <department>
+ <value>%{filter:departmentLink(row,dn,description)}</value>
+ <span>3</span>
+ </department>
<column>
<value>%{filter:objectType(dn,objectClass)}</value>
</column>
<column>
<column>
<value>%{filter:objectType(dn,objectClass)}</value>
</column>
<column>
- <label>Name / Department</label>
- <sortable>true</sortable>
- <value>%{filter:link(row,pid,dn,"%s, %s [%s]",sn,givenName,uid)}</value>
+ <label>Surname</label>
+ <sortAttribute>sn</sortAttribute>
+ <sortType>string</sortType>
+ <value>%{filter:link(row,dn,"%s",sn)}</value>
+ <export>true</export>
+ </column>
+
+ <column>
+ <label>Given name</label>
+ <sortAttribute>givenName</sortAttribute>
+ <sortType>string</sortType>
+ <value>%{filter:link(row,dn,"%s",givenName)}</value>
+ <export>true</export>
+ </column>
+
+ <column>
+ <label>Login</label>
+ <sortAttribute>uid</sortAttribute>
+ <sortType>string</sortType>
+ <value>%{filter:link(row,dn,"%s",uid)}</value>
+ <export>true</export>
</column>
<column>
<label>Properties</label>
</column>
<column>
<label>Properties</label>
- <sortable>false</sortable>
- <value>%{filter:accountProperties(dn,row,objectClass)}</value>
+ <value>%{filter:filterProperties(row,objectClass)}</value>
</column>
<column>
<label>Actions</label>
</column>
<column>
<label>Actions</label>
- <sortable>false</sortable>
- <value>%{filter:actions()}</value>
+ <value>%{filter:actions(dn,row,objectClass)}</value>
</column>
</table>
<actionmenu>
</column>
</table>
<actionmenu>
- <action>
- <type>sub</type>
- <image>images/lists/new.png</timage>
- <label>Create</label>
- <action>
- <name>create_user</name>
- <type>entry</type>
- <image>plugins/users/images/list_new_user.png</timage>
- <acl>users/user:c</acl>
- <label>User</label>
- </action>
+ <action>
+ <type>sub</type>
+ <image>images/lists/new.png</image>
+ <label>Create</label>
- <action>
- <name>create_template</name>
- <type>entry</type>
- <image>images/lists/new.png</timage>
- <acl>users/user:c</acl>
- <label>Template</label>
- </action>
+ <action>
+ <name>new</name>
+ <type>entry</type>
+ <image>plugins/users/images/list_new_user.png</image>
+ <label>User</label>
+ </action>
+ <action>
+ <name>new_template</name>
+ <type>entry</type>
+ <image>plugins/users/images/select_template.png</image>
+ <label>Template</label>
+ </action>
</action>
<action>
</action>
<action>
<action>
<name>edit</name>
<type>entry</type>
<action>
<name>edit</name>
<type>entry</type>
- <image>images/lists/edit.png</timage>
+ <image>images/lists/edit.png</image>
<label>Edit</label>
</action>
<label>Edit</label>
</action>
+ <action>
+ <name>remove</name>
+ <type>entry</type>
+ <image>images/lists/trash.png</image>
+ <label>Remove</label>
+ </action>
+
<action>
<name>password</name>
<type>entry</type>
<action>
<name>password</name>
<type>entry</type>
- <image>plugins/users/images/list_password.png</timage>
+ <image>plugins/users/images/list_password.png</image>
<label>Change password</label>
</action>
<action>
<label>Change password</label>
</action>
<action>
- <name>remove</name>
+ <type>separator</type>
+ </action>
+
+ <action>
+ <name>lockUsers</name>
<type>entry</type>
<type>entry</type>
- <image>images/lists/trash.png</timage>
- <label>Remove</label>
+ <image>images/lists/locked.png</image>
+ <acl>uniBonnAccount/password[w]</acl>
+ <label>Lock users</label>
+ </action>
+
+ <action>
+ <name>unlockUsers</name>
+ <type>entry</type>
+ <image>images/lists/unlocked.png</image>
+ <acl>uniBonnAccount/password[w]</acl>
+ <label>Unlock users</label>
+ </action>
+
+ <action>
+ <name>sendMessage</name>
+ <type>entry</type>
+ <depends>goto</depends>
+ <image>plugins/goto/images/notify.png</image>
+ <label>Send message</label>
+ </action>
+
+ <action>
+ <type>separator</type>
</action>
<action>
<name>templatize</name>
<type>entry</type>
</action>
<action>
<name>templatize</name>
<type>entry</type>
- <image>plugins/users/images/wizard.png</timage>
+ <image>plugins/users/images/wizard.png</image>
<label>Apply template</label>
</action>
<label>Apply template</label>
</action>
</action>
<action>
</action>
<action>
- <type>daemon</type>
+ <type>exporter</type>
</action>
<action>
</action>
<action>
</actionmenu>
<actiontriggers snapshot="true" copypaste="true">
</actionmenu>
<actiontriggers snapshot="true" copypaste="true">
+
+ <action>
+ <name>newfromtpl</name>
+ <type>entry</type>
+ <image>images/lists/new.png</image>
+ <objectclass>gosaUserTemplate</objectclass>
+ <label>New user from template</label>
+ </action>
+
<action>
<action>
+ <name>cp</name>
+ <objectclass>!gosaUserTemplate</objectclass>
<type>copypaste</type>
</action>
<action>
<name>edit</name>
<type>entry</type>
<type>copypaste</type>
</action>
<action>
<name>edit</name>
<type>entry</type>
- <image>images/lists/edit.png</timage>
- <acl>w</acl>
+ <objectclass>gosaAccount</objectclass>
+ <image>images/lists/edit.png</image>
<label>Edit user</label>
</action>
<action>
<name>lock</name>
<type>entry</type>
<label>Edit user</label>
</action>
<action>
<name>lock</name>
<type>entry</type>
- <image>%{filter:lockImage(userPassword)}</timage>
- <acl>users/password:w</acl>
+ <objectclass>!gosaUserTemplate</objectclass>
+ <image>%{filter:lockImage(userPassword)}</image>
+ <acl>uniBonnAccount/password[w]</acl>
<label>%{filter:lockLabel(userPassword)}</label>
</action>
<action>
<name>password</name>
<type>entry</type>
<label>%{filter:lockLabel(userPassword)}</label>
</action>
<action>
<name>password</name>
<type>entry</type>
- <image>plugins/users/images/list_password.png</timage>
- <acl>users/password:w</acl>
+ <objectclass>!gosaUserTemplate</objectclass>
+ <image>plugins/users/images/list_password.png</image>
<label>Change password</label>
</action>
<action>
<label>Change password</label>
</action>
<action>
+ <name>snapshot</name>
<type>snapshot</type>
<type>snapshot</type>
+ <objectclass>!gosaUserTemplate</objectclass>
</action>
<action>
<name>remove</name>
<type>entry</type>
</action>
<action>
<name>remove</name>
<type>entry</type>
- <image>images/lists/trash.png</timage>
- <acl>d</acl>
+ <image>images/lists/trash.png</image>
+ <objectclass>gosaAccount</objectclass>
+ <acl>users/user[d]</acl>
<label>Remove user</label>
</action>
<label>Remove user</label>
</action>