1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
From 1aa8fa3ae0a8e458b63b1ce5bf61b3818e76b5f3 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 13 Aug 2023 18:13:14 +0200
Subject: [PATCH 3/9] Revert "update for generic.tpl to use memberACL instead
of memberUidACL"
This reverts a variant of commit 0717777a19790e490fe436367069f9341d6577bc.
Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
plugins/admin/groups/classic/generic.tpl | 16 ++++++++--------
plugins/admin/groups/default/generic.tpl | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/plugins/admin/groups/classic/generic.tpl b/plugins/admin/groups/classic/generic.tpl
index 0f8f3e171..664ee15a9 100644
--- a/plugins/admin/groups/classic/generic.tpl
+++ b/plugins/admin/groups/classic/generic.tpl
@@ -1,4 +1,4 @@
-{if $multiple_support}
+[6~{if $multiple_support}
<input type="hidden" value="1" name="group_mulitple_edit">
{/if}
@@ -198,11 +198,11 @@
{if $restrictedByDynGroup}
<b>{t}The group members are part of a dyn-group and cannot be managed!{/t}</b>
{if $multiple_support}
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
{$commonList}
{/render}
{else}
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
{$memberList}
{/render}
{/if}
@@ -210,24 +210,24 @@
{if $multiple_support}
<h3>{t}Common group members{/t}</h3>
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
{$commonList}
{/render}
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
<button type='submit' name='edit_membership'>{msgPool type=addButton}</button>
{/render}
<br>
<h3>{t}Partial group members{/t}</h3>
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
{$partialList}
{/render}
{else}
<h3>{t}Group members{/t}</h3>
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
{$memberList}
{/render}
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
<button type='submit' name='edit_membership'>{msgPool type=addButton}</button>
{/render}
{/if}
diff --git a/plugins/admin/groups/default/generic.tpl b/plugins/admin/groups/default/generic.tpl
index 40caa0712..cc7bae63b 100644
--- a/plugins/admin/groups/default/generic.tpl
+++ b/plugins/admin/groups/default/generic.tpl
@@ -133,13 +133,13 @@
{if $multiple_support}
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
{$commonList}
{/render}
{else}
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
{$memberList}
{/render}
@@ -148,21 +148,21 @@
{if $multiple_support}
<h3 class="card-title">{t}Common group members{/t}</h3>
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
{$commonList}
<button class="btn-small" type='submit' name='edit_membership'>{msgPool type=addButton}</button>
{/render}
<h3 class="card-title">{t}Partial group members{/t}</h3>
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
{$partialList}
{/render}
{else}
<h3 class="card-title">{t}Group members{/t}</h3>
- {render acl=$memberACL}
+ {render acl=$memberUidACL}
{$memberList}
<button class="btn-small" type='submit' name='edit_membership'>{msgPool type=addButton}</button>
{/render}
--
2.39.2
|
