From 873d6af8bc843c6eea6049ace2f5218a371f01d4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 27 Feb 2018 17:02:40 +0100
Subject: [roomplanner] Add permissions
---
modules-available/roomplanner/page.inc.php | 45 ++++++++++++++++++++++--------
1 file changed, 34 insertions(+), 11 deletions(-)
(limited to 'modules-available/roomplanner/page.inc.php')
diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php
index 764d5cdb..2712560a 100644
--- a/modules-available/roomplanner/page.inc.php
+++ b/modules-available/roomplanner/page.inc.php
@@ -30,7 +30,7 @@ class Page_Roomplanner extends Page
{
User::load();
- if (!User::hasPermission('superadmin')) {
+ if (!User::isLoggedIn()) {
Message::addError('main.no-permission');
Util::redirect('?do=Main');
}
@@ -79,13 +79,22 @@ class Page_Roomplanner extends Page
$subnetMachines = $this->getPotentialMachines();
$machinesOnPlan = $this->getMachinesOnPlan($config['tutoruuid']);
$roomConfig = array_merge($furniture, $machinesOnPlan);
- Render::addTemplate('page', [
+ $canEdit = User::hasPermission('edit', $this->locationid);
+ $params = [
'location' => $this->location,
'managerip' => $managerIp,
'dediMgrChecked' => $dediMgr,
'subnetMachines' => json_encode($subnetMachines),
'locationid' => $this->locationid,
- 'roomConfiguration' => json_encode($roomConfig)]);
+ 'roomConfiguration' => json_encode($roomConfig),
+ 'edit_disabled' => $canEdit ? '' : 'disabled'
+ ];
+ Render::addTemplate('header', $params);
+ if ($canEdit) {
+ Render::addTemplate('item-selector', $params);
+ }
+ Render::addTemplate('main-roomplan', $params);
+ Render::addTemplate('footer', $params);
} else {
Message::addError('main.invalid-action', $this->action);
}
@@ -97,16 +106,30 @@ class Page_Roomplanner extends Page
$this->action = Request::any('action', false, 'string');
if ($this->action === 'getmachines') {
+
+ $locations = User::getAllowedLocations('edit');
+ if (empty($locations)) {
+ die('{"machines":[]}');
+ }
+
$query = Request::get('query', false, 'string');
$aquery = preg_replace('/[^\x01-\x7f]+/', '%', $query);
+ if (strlen(str_replace('%', '', $aquery)) < 2) {
+ $aquery = $query;
+ }
+
+ $condition = 'locationid IN (:locations)';
+ if (in_array(0, $locations)) {
+ $condition .= ' OR locationid IS NULL';
+ }
- $result = Database::simpleQuery('SELECT machineuuid, macaddr, clientip, hostname, fixedlocationid '
- . 'FROM machine '
- . 'WHERE machineuuid LIKE :aquery '
- . ' OR macaddr LIKE :aquery '
- . ' OR clientip LIKE :aquery '
- . ' OR hostname LIKE :query '
- . ' LIMIT 100', ['query' => "%$query%", 'aquery' => "%$aquery%"]);
+ $result = Database::simpleQuery("SELECT machineuuid, macaddr, clientip, hostname, fixedlocationid
+ FROM machine
+ WHERE ($condition) AND machineuuid LIKE :aquery
+ OR macaddr LIKE :aquery
+ OR clientip LIKE :aquery
+ OR hostname LIKE :query
+ LIMIT 100", ['query' => "%$query%", 'aquery' => "%$aquery%", 'locations' => $locations]);
$returnObject = ['machines' => []];
@@ -134,7 +157,7 @@ class Page_Roomplanner extends Page
private function handleSaveRequest($isAjax)
{
- /* save */
+ User::assertPermission('edit', $this->locationid);
$machinesOnPlan = $this->getMachinesOnPlan('invalid');
$config = Request::post('serializedRoom', null, 'string');
$config = json_decode($config, true);
--
cgit v1.2.3-55-g7522
From b8f7629f2b6425aa32021d7335a7e67e6d57b804 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 10 Apr 2018 17:12:13 +0200
Subject: [roomplanner] Add icon to PCs that opens machine details from
statistics module
---
modules-available/roomplanner/js/grid.js | 76 ++++++++++++++--------
modules-available/roomplanner/page.inc.php | 3 +-
modules-available/roomplanner/style.css | 15 +----
.../roomplanner/templates/footer.html | 1 +
4 files changed, 54 insertions(+), 41 deletions(-)
(limited to 'modules-available/roomplanner/page.inc.php')
diff --git a/modules-available/roomplanner/js/grid.js b/modules-available/roomplanner/js/grid.js
index ced76678..697d7c3f 100644
--- a/modules-available/roomplanner/js/grid.js
+++ b/modules-available/roomplanner/js/grid.js
@@ -40,9 +40,10 @@ if (!roomplanner) var roomplanner = {
if (!(new RegExp(".*(east|south|west|north)$").test($(el).attr('itemlook')))) {
return;
}
-
- $(el).append('');
- $(el).find('.rotationHandle').click(function () {
+
+ var $e = $('');
+ $(el).append($e);
+ $e.click(function () {
var str = $(el).attr('itemlook');
if (str.indexOf('-') > -1){
var values =str.split('-');
@@ -93,16 +94,34 @@ if (!roomplanner) var roomplanner = {
}
});
},
- initTutor: function(el) {
+ initPcButtons: function(el) {
if ($(el).attr('itemtype') !== 'pc') return;
- $(el).append('');
- $(el).find('.tutorHandle').click(function() {
- var wasTutor = ($(this).parent().attr('istutor') === 'true');
- $('[itemtype="pc"]').removeAttr('istutor');
- if (!wasTutor) {
- $(this).parent().attr('istutor', 'true');
- }
- });
+ var $e;
+ if (!PLANNER_READ_ONLY) {
+ $e = $('');
+ $(el).append($e);
+ $e.click(function () {
+ var wasTutor = ($(this).parent().attr('istutor') === 'true');
+ $('[itemtype="pc"]').removeAttr('istutor');
+ if (!wasTutor) {
+ $(this).parent().attr('istutor', 'true');
+ }
+ });
+ }
+ if (CAN_OPEN_STATS) {
+ $e = $('');
+ $(el).append($e);
+ $e.click(function () {
+ var uuid = $(this).parent().attr('muuid');
+ console.log('Click: ', uuid);
+ var url = '?do=statistics&uuid=' + uuid;
+ if (roomplanner.serialize() !== plannerLoadState) {
+ window.open(url);
+ } else {
+ window.location.href = url;
+ }
+ });
+ }
},
initTooltip: function(el) {
if ($(el).attr('itemtype') === 'pc') {
@@ -338,9 +357,9 @@ if (!roomplanner) var roomplanner = {
if (!item.hasOwnProperty(prop)) continue;
html += prop+'="'+item[prop]+'" ';
}
- html += 'class="draggable ui-draggable';
- if (PLANNER_READ_ONLY) {
- html += ' disabled';
+ html += 'class="ui-draggable';
+ if (!PLANNER_READ_ONLY) {
+ html += ' draggable';
}
html += '">';
return html;
@@ -367,12 +386,12 @@ if (!roomplanner) var roomplanner = {
$gridInner.find('.draggable').each(function(idx,el) {
roomplanner.initDraggable(el);
roomplanner.initResizable(el);
- if (!PLANNER_READ_ONLY) {
- roomplanner.initTooltip(el);
- roomplanner.initRotation(el);
- roomplanner.initDelete(el);
- roomplanner.initTutor(el);
- }
+ roomplanner.initTooltip(el);
+ roomplanner.initRotation(el);
+ roomplanner.initDelete(el);
+ });
+ $gridInner.find('.ui-draggable').each(function(idx,el) {
+ roomplanner.initPcButtons(el);
});
roomplanner.grid.scale(roomplanner.settings.scale);
@@ -415,10 +434,11 @@ roomplanner.grid = (function() {
var pos = roomplanner.getCellPositionFromGrid($item.attr('gridRow'),$item.attr('gridCol'));
$item.css({width: w+"px", height: h+"px", left: pos[0]+"px", top: pos[1]+"px"});
- $item.draggable("option","grid",[(roomplanner.settings.scale / 4), (roomplanner.settings.scale / 4)]);
-
- if (roomplanner.isElementResizable(item)) {
- $item.resizable("option","grid",[(roomplanner.settings.scale / 4), (roomplanner.settings.scale / 4)]);
+ if ($item.hasClass('draggable')) {
+ $item.draggable("option", "grid", [(roomplanner.settings.scale / 4), (roomplanner.settings.scale / 4)]);
+ if (roomplanner.isElementResizable(item)) {
+ $item.resizable("option", "grid", [(roomplanner.settings.scale / 4), (roomplanner.settings.scale / 4)]);
+ }
}
});
this.resize();
@@ -622,10 +642,10 @@ $(document).ready(function(){
roomplanner.initTooltip(el);
}
});
- }
- roomplanner.initDelete(el);
+ }
roomplanner.initRotation(el);
- roomplanner.initTutor(el);
+ roomplanner.initDelete(el);
+ roomplanner.initPcButtons(el);
}
}
diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php
index 2712560a..023cef73 100644
--- a/modules-available/roomplanner/page.inc.php
+++ b/modules-available/roomplanner/page.inc.php
@@ -87,7 +87,8 @@ class Page_Roomplanner extends Page
'subnetMachines' => json_encode($subnetMachines),
'locationid' => $this->locationid,
'roomConfiguration' => json_encode($roomConfig),
- 'edit_disabled' => $canEdit ? '' : 'disabled'
+ 'edit_disabled' => $canEdit ? '' : 'disabled',
+ 'statistics_disabled' => Module::get('statistics') !== false && User::hasPermission('.statistics.machine.view-details') ? '' : 'disabled',
];
Render::addTemplate('header', $params);
if ($canEdit) {
diff --git a/modules-available/roomplanner/style.css b/modules-available/roomplanner/style.css
index 9359f82b..f1dd994a 100644
--- a/modules-available/roomplanner/style.css
+++ b/modules-available/roomplanner/style.css
@@ -701,24 +701,15 @@ ul.toollist li {
display:none;
float: right;}
-.rotationHandle,
-.tutorHandle {
+.pcHandle {
display:none;
float: left;}
-div.draggable:hover .rotationHandle,
-div.draggable:hover .tutorHandle{
+div.ui-draggable:hover > .deleteHandle,
+div.ui-draggable:hover > .pcHandle {
display:inline;
cursor: pointer;}
-div.draggable:hover .deleteHandle {
- display:inline;
- cursor: pointer;}
-
-.draggable.disabled {
- pointer-events: none;
-}
-
[itemtype="furniture"], [itemtype="furniture_drag"] {
z-index: 99;
background-size: 100% 100%;}
diff --git a/modules-available/roomplanner/templates/footer.html b/modules-available/roomplanner/templates/footer.html
index 6e4e0783..3294d5ee 100644
--- a/modules-available/roomplanner/templates/footer.html
+++ b/modules-available/roomplanner/templates/footer.html
@@ -21,6 +21,7 @@ var locationId = '{{locationid}}';
var subnetMachines, roomConfiguration;
var plannerLoadState = 'invalid';
const PLANNER_READ_ONLY = '{{edit_disabled}}'.length !== 0;
+const CAN_OPEN_STATS = '{{statistics_disabled}}'.length === 0;
document.addEventListener("DOMContentLoaded", function () {
subnetMachines = makeCombinedField({{{subnetMachines}}});
--
cgit v1.2.3-55-g7522
From a56e3487dd09740996e3648173a550d368bdb10d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 16 Jul 2018 15:17:35 +0200
Subject: [roomplanner] Fix search feature: load user in ajax call
---
modules-available/roomplanner/page.inc.php | 1 +
1 file changed, 1 insertion(+)
(limited to 'modules-available/roomplanner/page.inc.php')
diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php
index 023cef73..8b75499b 100644
--- a/modules-available/roomplanner/page.inc.php
+++ b/modules-available/roomplanner/page.inc.php
@@ -108,6 +108,7 @@ class Page_Roomplanner extends Page
if ($this->action === 'getmachines') {
+ User::load();
$locations = User::getAllowedLocations('edit');
if (empty($locations)) {
die('{"machines":[]}');
--
cgit v1.2.3-55-g7522