Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 69df38d3

Von Moritz Bunkus vor mehr als 11 Jahren hinzugefügt

  • ID 69df38d39da1a1fcbf59ebc8f3ddd29a1f82ec29
  • Vorgänger 91d2ef32
  • Nachfolger c2692077

Gruppenverwaltung auf Controllermodel umgestellt

Dabei auch Verknüpfung Gruppen <-> Mandanten implementiert.

Unterschiede anzeigen:

templates/webpages/admin/show.html
11 11
 <span class="link_separator">|</span>
12 12
 [% L.link(SELF.url_for(action="new_client"), LxERP.t8("Add Client")) %]
13 13
 <span class="link_separator">|</span>
14
 [% L.link(SELF.url_for(action="edit_groups"), LxERP.t8("Edit groups")) %]
14
 [% L.link(SELF.url_for(action="new_group"), LxERP.t8("Add User Group")) %]
15 15
 <span class="link_separator">|</span>
16 16
 [% L.link(SELF.url_for(action="pg_database_administration", controller="admin.pl"), LxERP.t8("Pg Database Administration")) %]
17 17
 <span class="link_separator">|</span>
18 18
 [% L.link(SELF.url_for(action="printer_management", controller="admin.pl"), LxERP.t8("Printer Management")) %]
19 19
 <span class="link_separator">|</span>
20
 [% IF LOCKED %]
20
 [% IF SELF.is_locked %]
21 21
  [% L.link(SELF.url_for(action="unlock_system"), LxERP.t8("Unlock System")) %]
22 22
 [% ELSE %]
23 23
  [% L.link(SELF.url_for(action="lock_system"), LxERP.t8("Lock System")) %]
......
34 34
 <ul>
35 35
  <li><a href="#user_list">[%- LxERP.t8("User list") %]</a></li>
36 36
  <li><a href="#client_list">[%- LxERP.t8("Client list") %]</a></li>
37
  <li><a href="#group_list">[%- LxERP.t8("Group list") %]</a></li>
37 38
 </ul>
38 39

  
39 40
 <div id="user_list">
40
[%- IF !USERS.size %]
41
[%- IF !SELF.all_users.size %]
41 42
  <p>
42 43
   [% LxERP.t8("No users have been created yet.") %]
43
   [% LxERP.t8("In order to use kivitendo you have to create at least one client, one user, and grant that user access to the client.") %]
44
   [% LxERP.t8("In order to use kivitendo you have to create at least a client, a user and a group.") %]
44 45
  </p>
45 46

  
46 47
[%- ELSE %]
......
51 52
    <th>[% LxERP.t8('Language') %]</th>
52 53
   </tr>
53 54

  
54
[% FOREACH user = USERS %]
55
[% FOREACH user = SELF.all_users %]
55 56
[%- SET config = user.config_values %]
56 57
   <tr class="listrow">
57 58
    <td>[% L.link(SELF.url_for(action="edit_user", id=user.id), HTML.escape(user.login)) %]</td>
......
64 65
 </div>
65 66

  
66 67
 <div id="client_list">
67
[%- IF !CLIENTS.size %]
68
[%- IF !SELF.all_clients.size %]
68 69
  <p>
69 70
   [% LxERP.t8("No clients have been created yet.") %]
70
   [% LxERP.t8("In order to use kivitendo you have to create at least one client, one user, and grant that user access to the client.") %]
71
   [% LxERP.t8("In order to use kivitendo you have to create at least a client, a user and a group.") %]
71 72
  </p>
72 73

  
73 74
[%- ELSE %]
......
81 82
    <th>[% LxERP.t8('Default client') %]</th>
82 83
   </tr>
83 84

  
84
[%- FOREACH client = CLIENTS %]
85
[%- FOREACH client = SELF.all_clients %]
85 86
   <tr class="listrow">
86 87
    <td>[% L.link(SELF.url_for(action="edit_client", id=client.id), HTML.escape(client.name)) %]</td>
87 88
    <td>[% HTML.escape(client.id) %]</td>
......
92 93
   </tr>
93 94
[%- END %]
94 95
  </table>
96
[%- END %]
97
 </div>
98

  
99
 <div id="group_list">
100
[%- IF !SELF.all_groups.size %]
101
  <p>
102
   [% LxERP.t8("No groups have been created yet.") %]
103
   [% LxERP.t8("In order to use kivitendo you have to create at least a client, a user and a group.") %]
104
  </p>
105

  
106
[%- ELSE %]
107
  <table width="100%">
108
   <tr class="listheading">
109
    <th>[% LxERP.t8('Name') %]</th>
110
    <th>[% LxERP.t8('Description') %]</th>
111
   </tr>
112

  
113
[%- FOREACH group = SELF.all_groups %]
114
   <tr class="listrow">
115
    <td>[% L.link(SELF.url_for(action="edit_group", id=group.id), HTML.escape(group.name)) %]</td>
116
    <td>[% HTML.escape(group.description) %]</td>
117
   </tr>
118
[%- END %]
119
  </table>
95 120
[%- END %]
96 121
 </div>
97 122
</div>

Auch abrufbar als: Unified diff