From 47d1e28478a78eb8d275553cb44693a61b597307 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 27 Feb 2018 13:05:21 +0100
Subject: [runmode] Support permissions supplied by module; fix handling of
 deleteUrl modules

---
 .../runmode/templates/machine-selector.html        | 31 +++++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'modules-available/runmode/templates/machine-selector.html')

diff --git a/modules-available/runmode/templates/machine-selector.html b/modules-available/runmode/templates/machine-selector.html
index 7f37f5a2..8b608f7e 100644
--- a/modules-available/runmode/templates/machine-selector.html
+++ b/modules-available/runmode/templates/machine-selector.html
@@ -1,12 +1,7 @@
 <h1>{{lang_assignRunmodeToMachine}}</h1>
 <h2>{{moduleName}} // {{modeName}}</h2>
-<p>{{lang_assignMachineIntroText}}</p>
 
-<div class="hidden">
-	{{#machines}}
-		<div id="qex-{{machineuuid}}">{{hostname}}</div>
-	{{/machines}}
-</div>
+<p>{{lang_assignMachineIntroText}}</p>
 
 <h4>{{lang_addNewMachines}}</h4>
 <form method="post" action="?do=runmode">
@@ -15,13 +10,18 @@
 	<input type="hidden" name="module" value="{{module}}" id="i-module">
 	<input type="hidden" name="modeid" value="{{modeid}}" id="i-modeid">
 	<input type="hidden" name="redirect" value="{{redirect}}">
-	<select id="machine-sel" name="machines[]" multiple>
+	<select id="machine-sel" name="machines[]" multiple {{disabled}}>
 	</select>
 	<div class="buttonbar">
-		<button type="submit" class="btn btn-primary">{{lang_save}}</button>
+		<button type="submit" class="btn btn-primary" {{disabled}}>{{lang_save}}</button>
 	</div>
 </form>
 
+{{#add-only}}
+	<h4>{{lang_existingClients}}</h4>
+	<div id="existing-list"></div>
+{{/add-only}}
+
 <script type="application/javascript"><!--
 
 const MODULE = document.getElementById('i-module').value;
@@ -58,7 +58,7 @@ function loadMachines(query, callback) {
 		}
 	}
 	$.ajax({
-		url: '?do=runmode&action=getmachines&query=' + encodeURIComponent(query),
+		url: '?do=runmode&action=getmachines&module={{module}}&query=' + encodeURIComponent(query),
 		type: 'GET',
 		dataType: 'json',
 		error: function () {
@@ -120,6 +120,17 @@ document.addEventListener('DOMContentLoaded', function () {
 		})();
 	});
 	var old = {{{machines}}} || [];
+	var list = $('#existing-list');
+	if (list.length !== 0) {
+		old.forEach(function (x) { list.append(renderMachineOption(x, function(str) {
+			return (str + '')
+					.replace(/&/g, '&amp;')
+					.replace(/</g, '&lt;')
+					.replace(/>/g, '&gt;')
+					.replace(/"/g, '&quot;');
+		}))});
+		old = [];
+	}
 	var $box = $('#machine-sel').selectize({
 		options: old,
 		items: old.map(function(x) { return x.machineuuid; }),
@@ -132,7 +143,7 @@ document.addEventListener('DOMContentLoaded', function () {
 		load: loadMachines,
 		maxItems: null,
 		sortField: 'hostname',
-		sortDirection: 'asc',
+		sortDirection: 'asc'
 	});
 });
 
-- 
cgit v1.2.3-55-g7522


From 770d4cc111ece6478ccf224cade883c4e7e1381a Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Mon, 10 Dec 2018 11:27:09 +0100
Subject: [runmode] Simple back/cancel button

---
 modules-available/runmode/templates/machine-selector.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules-available/runmode/templates/machine-selector.html')

diff --git a/modules-available/runmode/templates/machine-selector.html b/modules-available/runmode/templates/machine-selector.html
index 8b608f7e..665c56f3 100644
--- a/modules-available/runmode/templates/machine-selector.html
+++ b/modules-available/runmode/templates/machine-selector.html
@@ -13,6 +13,7 @@
 	<select id="machine-sel" name="machines[]" multiple {{disabled}}>
 	</select>
 	<div class="buttonbar">
+		<button type="button" class="btn btn-default" onClick="javascript:history.back()">{{lang_cancel}}</button>
 		<button type="submit" class="btn btn-primary" {{disabled}}>{{lang_save}}</button>
 	</div>
 </form>
-- 
cgit v1.2.3-55-g7522