From ded51ef4f52ca88dc75c2d3f0cea1597c7fd5c44 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 16 Feb 2018 13:42:28 +0100
Subject: [vmstore] Simplify permissions

---
 modules-available/vmstore/lang/de/permissions.json     |  4 +---
 modules-available/vmstore/lang/en/permissions.json     |  4 +---
 modules-available/vmstore/page.inc.php                 | 15 +--------------
 modules-available/vmstore/permissions/permissions.json |  8 +-------
 modules-available/vmstore/templates/page-vmstore.html  | 12 ++++++------
 5 files changed, 10 insertions(+), 33 deletions(-)

(limited to 'modules-available/vmstore')

diff --git a/modules-available/vmstore/lang/de/permissions.json b/modules-available/vmstore/lang/de/permissions.json
index f3148ea8..1f8d18d7 100644
--- a/modules-available/vmstore/lang/de/permissions.json
+++ b/modules-available/vmstore/lang/de/permissions.json
@@ -1,5 +1,3 @@
 {
-	"choose.internal": "Internen Speicher auswählen.",
-	"choose.nfs": "Einen NFS Netzwerkspeicher auswählen.",
-	"choose.cifs": "Einen CIFS Netzwerkspeicher auswählen."
+    "edit": "Den verwendeten VM-Speicher konfigurieren."
 }
\ No newline at end of file
diff --git a/modules-available/vmstore/lang/en/permissions.json b/modules-available/vmstore/lang/en/permissions.json
index 00708f7d..6d34014a 100644
--- a/modules-available/vmstore/lang/en/permissions.json
+++ b/modules-available/vmstore/lang/en/permissions.json
@@ -1,5 +1,3 @@
 {
-	"choose.internal": "Choose internal storage.",
-	"choose.nfs": "Choose a NFS network storage.",
-	"choose.cifs": "Choose a CIFS network storage."
+    "edit": "Configure VM storage to use."
 }
\ No newline at end of file
diff --git a/modules-available/vmstore/page.inc.php b/modules-available/vmstore/page.inc.php
index c3d5da77..126e56d3 100644
--- a/modules-available/vmstore/page.inc.php
+++ b/modules-available/vmstore/page.inc.php
@@ -8,10 +8,7 @@ class Page_VmStore extends Page
 	{
 		User::load();
 
-		if (!User::isLoggedIn()) {
-			Message::addError('main.no-permission');
-			Util::redirect('?do=Main');
-		}
+		User::assertPermission('edit');
 		
 		$action = Request::post('action');
 		
@@ -33,10 +30,6 @@ class Page_VmStore extends Page
 		if (isset($vmstore['storetype'])) {
 			$vmstore['pre-' . $vmstore['storetype']] = 'checked';
 		}
-		$vmstore['internalAllowed'] = User::hasPermission("choose.internal");
-		$vmstore['nfsAllowed'] = User::hasPermission("choose.nfs");
-		$vmstore['cifsAllowed'] = User::hasPermission("choose.cifs");
-		$vmstore['saveAllowed'] = $vmstore['internalAllowed'] || $vmstore['nfsAllowed'] || $vmstore['cifsAllowed'];
 		Render::addTemplate('page-vmstore', $vmstore);
 	}
 	
@@ -51,12 +44,6 @@ class Page_VmStore extends Page
 			Message::addError('main.value-invalid', 'type', $storetype);
 			Util::redirect('?do=VmStore');
 		}
-		if (($storetype === 'internal' && !User::hasPermission("choose.internal")) ||
-			 ($storetype === 'nfs' && !User::hasPermission("choose.nfs")) ||
-			 ($storetype === 'cifs' && !User::hasPermission("choose.cifs"))) {
-			Message::addError('main.no-permission');
-			Util::redirect('?do=VmStore');
-		}
 		// Validate syntax of nfs/cifs
 		if ($storetype === 'nfs' && !preg_match('#^\S+:\S+$#is', $vmstore['nfsaddr'])) {
 			Message::addError('main.value-invalid', 'nfsaddr', $vmstore['nfsaddr']);
diff --git a/modules-available/vmstore/permissions/permissions.json b/modules-available/vmstore/permissions/permissions.json
index 29ee6a51..8303fd02 100644
--- a/modules-available/vmstore/permissions/permissions.json
+++ b/modules-available/vmstore/permissions/permissions.json
@@ -1,11 +1,5 @@
 {
-    "choose.cifs": {
-        "location-aware": false
-    },
-    "choose.internal": {
-        "location-aware": false
-    },
-    "choose.nfs": {
+    "edit": {
         "location-aware": false
     }
 }
\ No newline at end of file
diff --git a/modules-available/vmstore/templates/page-vmstore.html b/modules-available/vmstore/templates/page-vmstore.html
index fece8e24..6156597b 100644
--- a/modules-available/vmstore/templates/page-vmstore.html
+++ b/modules-available/vmstore/templates/page-vmstore.html
@@ -9,11 +9,11 @@
 	<p>{{lang_vmLocationChoose}} <a class="btn btn-default" data-toggle="modal" data-target="#help-store"><span class="glyphicon glyphicon-question-sign"></span></a></p>
 
 
-	<div class="panel panel-default {{^internalAllowed}}disabledPanel{{/internalAllowed}}">
+	<div class="panel panel-default">
 		<div class="panel-heading">
 			<div class="radio">
 				<input type="radio" name="storetype" value="internal" {{pre-internal}} id="id-internal">
-				<label for="id-internal">{{lang_internal}}</label>
+				<label for="id-internal">{{lang_intern}}</label>
 			</div>
 		</div>
 		<div class="panel-body">
@@ -21,7 +21,7 @@
 		</div>
 	</div>
 
-	<div class="panel panel-default {{^nfsAllowed}}disabledPanel{{/nfsAllowed}}">
+	<div class="panel panel-default">
 		<div class="panel-heading">
 			<div class="radio radio-inline">
 				<input type="radio" name="storetype" value="nfs" {{pre-nfs}} id="id-nfs">
@@ -37,7 +37,7 @@
 
 
 
-	<div class="panel panel-default {{^cifsAllowed}}disabledPanel{{/cifsAllowed}}">
+	<div class="panel panel-default">
 		<div class="panel-heading">
 			<div class="radio radio-inline">
 				<input type="radio" name="storetype" value="cifs" {{pre-cifs}} id="id-cifs">
@@ -46,7 +46,7 @@
 			<a class="btn btn-default btn-sm" data-toggle="modal" data-target="#help-cifs"><span class="glyphicon glyphicon-question-sign"></span></a>
 		</div>
 		<div class="panel-body">
-			<label for="cifsaddr">UNC-{{lang_path}}</label>
+			<label for="cifsaddr">UNC-Pfad</label>
 			<input type="text" class="form-control" name="cifsaddr" value="{{cifsaddr}}" placeholder="\\samba.server.example.com\bwlp" id="cifsaddr">
 			<br>
 			<label for="cifsuser">{{lang_readWrite}}</label>
@@ -75,7 +75,7 @@
 		</div>
 	</div>
 	<div class="text-right">
-		<button class="btn btn-primary" type="submit" {{^saveAllowed}}disabled{{/saveAllowed}}><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
+		<button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
 	</div>
 
 </form>
-- 
cgit v1.2.3-55-g7522