From f73a41753d2608187a0c85a28e419b8ea839d671 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 23 Feb 2018 15:26:17 +0100
Subject: [adduser] Extend module to simple user manager (add/edit/remove)

TODO: Assign roles
---
 modules-available/adduser/permissions/permissions.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 modules-available/adduser/permissions/permissions.json

(limited to 'modules-available/adduser/permissions/permissions.json')

diff --git a/modules-available/adduser/permissions/permissions.json b/modules-available/adduser/permissions/permissions.json
new file mode 100644
index 00000000..e778b893
--- /dev/null
+++ b/modules-available/adduser/permissions/permissions.json
@@ -0,0 +1,14 @@
+{
+	"user.add": {
+		"location-aware": false
+	},
+	"user.edit": {
+		"location-aware": false
+	},
+	"user.remove": {
+		"location-aware": false
+	},
+	"list.view": {
+		"location-aware": false
+	}
+}
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 018339a07bd6511275b6a780cd9a2b54eb319414 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 9 Apr 2018 17:04:38 +0200
Subject: [adduser] Rename permission to view-list

---
 modules-available/adduser/page.inc.php                 | 2 +-
 modules-available/adduser/permissions/permissions.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules-available/adduser/permissions/permissions.json')

diff --git a/modules-available/adduser/page.inc.php b/modules-available/adduser/page.inc.php
index c43a04e6..3af4ea6d 100644
--- a/modules-available/adduser/page.inc.php
+++ b/modules-available/adduser/page.inc.php
@@ -191,7 +191,7 @@ class Page_AddUser extends Page
 				Render::closeTag('form');
 			}
 		} elseif ($show === 'list') {
-			User::assertPermission('list.view');
+			User::assertPermission('user.view-list');
 			$page = new Paginate('SELECT userid, login, fullname, phone, email FROM user ORDER BY login', 50);
 			$data = ['list' => $page->exec()->fetchAll(PDO::FETCH_ASSOC)];
 			foreach ($data['list'] as &$u) {
diff --git a/modules-available/adduser/permissions/permissions.json b/modules-available/adduser/permissions/permissions.json
index e778b893..e8fd0a5e 100644
--- a/modules-available/adduser/permissions/permissions.json
+++ b/modules-available/adduser/permissions/permissions.json
@@ -8,7 +8,7 @@
 	"user.remove": {
 		"location-aware": false
 	},
-	"list.view": {
+	"user.view-list": {
 		"location-aware": false
 	}
 }
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522