From 3ddf56c399746efe3c56194b7be522a92caefb59 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 16 Jan 2018 17:50:22 +0100
Subject: [minilinux] implemented permission-system. you can't see the side
 without any permission. there are only 2 permissions: show the side and
 update content (which includes the show permission).

---
 modules-available/minilinux/lang/en/permissions.json | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 modules-available/minilinux/lang/en/permissions.json

(limited to 'modules-available/minilinux/lang/en/permissions.json')

diff --git a/modules-available/minilinux/lang/en/permissions.json b/modules-available/minilinux/lang/en/permissions.json
new file mode 100644
index 00000000..878388b0
--- /dev/null
+++ b/modules-available/minilinux/lang/en/permissions.json
@@ -0,0 +1,4 @@
+{
+	"show": "Show list of minilinux components. Not needed if User has any of the other permissions.",
+	"update": "Update minilinux components."
+}
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 49a2b4662fbc8950a28a22ff7b09f30f30c8b338 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 27 Mar 2018 15:35:28 +0200
Subject: [minilinux] permission 'show' => 'view'

Refs #3338
---
 modules-available/minilinux/lang/de/permissions.json     | 2 +-
 modules-available/minilinux/lang/de/template-tags.json   | 5 +++--
 modules-available/minilinux/lang/en/permissions.json     | 2 +-
 modules-available/minilinux/lang/en/template-tags.json   | 5 +++--
 modules-available/minilinux/page.inc.php                 | 2 +-
 modules-available/minilinux/permissions/permissions.json | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'modules-available/minilinux/lang/en/permissions.json')

diff --git a/modules-available/minilinux/lang/de/permissions.json b/modules-available/minilinux/lang/de/permissions.json
index 372ffc88..29012620 100644
--- a/modules-available/minilinux/lang/de/permissions.json
+++ b/modules-available/minilinux/lang/de/permissions.json
@@ -1,4 +1,4 @@
 {
-	"show": "Zeige Komponenten des Minilinux. Wird nicht benötigt, wenn Nutzer eine der anderen Rechte hat.",
+	"view": "Zeige Komponenten des Minilinux. Wird nicht benötigt, wenn Nutzer eine der anderen Rechte hat.",
 	"update": "Aktualisieren von Komponenten des Minilinux."
 }
\ No newline at end of file
diff --git a/modules-available/minilinux/lang/de/template-tags.json b/modules-available/minilinux/lang/de/template-tags.json
index 18a8b7af..60a11db9 100644
--- a/modules-available/minilinux/lang/de/template-tags.json
+++ b/modules-available/minilinux/lang/de/template-tags.json
@@ -1,5 +1,4 @@
 {
-    "lang_uptodate": "Aktuell",
     "lang_canUpdate1": "Mindestens eine Komponente von",
     "lang_canUpdate2": "kann aktualisiert werden. F\u00fcr einen reibungslosen Betrieb wird empfohlen, alle Komponenten auf dem aktuellen Stand zu halten.",
     "lang_configurationPackageNotFound": "Keine Konfigurationspakete gefunden!",
@@ -10,5 +9,7 @@
     "lang_outdated": "Veraltet",
     "lang_redownload": "Erneut herunterladen",
     "lang_systemUpdated": "Das System ist auf dem aktuellen Stand.",
-    "lang_update": "Aktualisieren"
+    "lang_update": "Aktualisieren",
+    "lang_updateAll": "Alle Module aktualisieren",
+    "lang_uptodate": "Aktuell"
 }
\ No newline at end of file
diff --git a/modules-available/minilinux/lang/en/permissions.json b/modules-available/minilinux/lang/en/permissions.json
index 878388b0..b8389e62 100644
--- a/modules-available/minilinux/lang/en/permissions.json
+++ b/modules-available/minilinux/lang/en/permissions.json
@@ -1,4 +1,4 @@
 {
-	"show": "Show list of minilinux components. Not needed if User has any of the other permissions.",
+	"view": "Show list of minilinux components. Not needed if User has any of the other permissions.",
 	"update": "Update minilinux components."
 }
\ No newline at end of file
diff --git a/modules-available/minilinux/lang/en/template-tags.json b/modules-available/minilinux/lang/en/template-tags.json
index aef15c03..48ba0c15 100644
--- a/modules-available/minilinux/lang/en/template-tags.json
+++ b/modules-available/minilinux/lang/en/template-tags.json
@@ -1,5 +1,4 @@
 {
-    "lang_uptodate": "Up to date",
     "lang_canUpdate1": "At least one component of",
     "lang_canUpdate2": "Can be updated. For a smooth operation, it is recommended to keep all components up to date.",
     "lang_configurationPackageNotFound": "Configuration package not found!",
@@ -10,5 +9,7 @@
     "lang_outdated": "Outdated",
     "lang_redownload": "Download again",
     "lang_systemUpdated": "The system is up to date.",
-    "lang_update": "Update"
+    "lang_update": "Update",
+    "lang_updateAll": "Update all modules",
+    "lang_uptodate": "Up to date"
 }
\ No newline at end of file
diff --git a/modules-available/minilinux/page.inc.php b/modules-available/minilinux/page.inc.php
index 6a331e1e..2488b2dc 100644
--- a/modules-available/minilinux/page.inc.php
+++ b/modules-available/minilinux/page.inc.php
@@ -12,7 +12,7 @@ class Page_MiniLinux extends Page
 			Util::redirect('?do=Main');
 		}
 
-		User::assertPermission('show');
+		User::assertPermission('view');
 	}
 
 	protected function doRender()
diff --git a/modules-available/minilinux/permissions/permissions.json b/modules-available/minilinux/permissions/permissions.json
index 650f7e71..b018ee72 100644
--- a/modules-available/minilinux/permissions/permissions.json
+++ b/modules-available/minilinux/permissions/permissions.json
@@ -1,5 +1,5 @@
 {
-    "show": {
+    "view": {
         "location-aware": false
     },
     "update": {
-- 
cgit v1.2.3-55-g7522