From 5f439862d5a96b5f5e8406e68b6814230a2d471a Mon Sep 17 00:00:00 2001
From: binsky <timo@binsky.org>
Date: Wed, 17 Mar 2021 00:56:22 +0100
Subject: [PATCH] fix vaults mover

---
 controller/admincontroller.php |  1 +
 css/admin.css                  |  4 ++++
 css/admin.css.map              |  2 +-
 js/settings-admin.js           | 34 ++++++++++++++++++++++++++++------
 sass/admin.scss                |  8 +++++++-
 templates/admin.php            |  4 ++--
 6 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/controller/admincontroller.php b/controller/admincontroller.php
index f3bfdfbb..8545b185 100644
--- a/controller/admincontroller.php
+++ b/controller/admincontroller.php
@@ -98,6 +98,7 @@ class AdminController extends ApiController {
 
 				$c = $credential->jsonSerialize();
 				$c['user_id'] = $destination_account;
+				$c['icon'] = json_encode($c['icon']);
 				$this->credentialService->updateCredential($c, true);
 			}
 			$vault->setUserId($destination_account);
diff --git a/css/admin.css b/css/admin.css
index f362cfb5..06ea9af9 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -2,6 +2,10 @@
   padding: 5px; }
 #passwordSharingSettings #mover input[type="text"] {
   width: 350px; }
+#passwordSharingSettings #mover .account_mover_selector {
+  width: 350px; }
+  #passwordSharingSettings #mover .account_mover_selector .select2-choice {
+    height: 34px; }
 #passwordSharingSettings #requests-table {
   width: 100%; }
 
diff --git a/css/admin.css.map b/css/admin.css.map
index 410bb786..df50b77a 100644
--- a/css/admin.css.map
+++ b/css/admin.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAGM,wCAAE;EACA,OAAO,EAAE,GAAG;AAGhB,kDAAkB;EAChB,KAAK,EAAE,KAAK;AAGhB,wCAAe;EACb,KAAK,EAAE,IAAI",
+"mappings": "AAGM,wCAAE;EACA,OAAO,EAAE,GAAG;AAGhB,kDAAkB;EAChB,KAAK,EAAE,KAAK;AAEd,uDAAwB;EACtB,KAAK,EAAE,KAAK;EACZ,uEAAgB;IACd,MAAM,EAAE,IAAI;AAIlB,wCAAe;EACb,KAAK,EAAE,IAAI",
 "sources": ["../sass/admin.scss"],
 "names": [],
 "file": "admin.css"
diff --git a/js/settings-admin.js b/js/settings-admin.js
index b607e161..50146b07 100644
--- a/js/settings-admin.js
+++ b/js/settings-admin.js
@@ -137,16 +137,38 @@ $(document).ready(function () {
 		'source_account': '',
 		'destination_account': ''
 	};
-	$(".username-autocomplete").autocomplete({
-		source: OC.generateUrl('apps/passman/admin/search'),
-		minLength: 1,
-		select: function (event, ui) {
-			accountMover[$(this).attr('id')] = ui.item.value;
-		}
+	$('.account_mover_selector').select2({
+		ajax: {
+			url: OC.generateUrl('apps/passman/admin/search'),
+			dataType: 'json',
+			delay: 50,
+			data: function (param) {
+				return {
+					term: param
+				};
+			},
+			results: function (data) {
+				var res = [];
+				for (var i = 0; i < data.length; i++) {
+					res.push({
+						id: i,
+						text: data[i].value
+					});
+				}
+				return {
+					results: res
+				};
+			},
+			cache: true
+		},
+		placeholder: 'Search for a user',
+		minimumInputLength: 1
 	});
 
 	$('#move_credentials').click(function () {
 		var self = this;
+		accountMover.source_account = $('#s2id_source_account a .select2-chosen').html();
+		accountMover.destination_account = $('#s2id_destination_account a .select2-chosen').html();
 		$('#moveStatus').hide();
 		$(self).attr('disabled', 'disabled');
 		$(self).html('<i class="fa fa-spinner fa-spin"></i> ' + OC.L10N.translate('passman', 'Moving') + '...');
diff --git a/sass/admin.scss b/sass/admin.scss
index 2eae188d..b15ba68a 100644
--- a/sass/admin.scss
+++ b/sass/admin.scss
@@ -8,8 +8,14 @@
     input[type="text"]{
       width: 350px;
     }
+    .account_mover_selector {
+      width: 350px;
+      .select2-choice {
+        height: 34px;
+      }
+    }
   }
   #requests-table{
     width: 100%;
   }
-}
\ No newline at end of file
+}
diff --git a/templates/admin.php b/templates/admin.php
index 1598eef1..84918eab 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -123,11 +123,11 @@ style('passman', 'vendor/font-awesome/font-awesome.min');
 			<table class="table">
 				<tr>
 					<td><?php p($l->t('Source account')); ?> </td>
-					<td><input class="username-autocomplete" type="text" id="source_account" name="source_account"></td>
+					<td><input type="hidden" class="form-control account_mover_selector" id="source_account"></td>
 				</tr>
 				<tr>
 					<td><?php p($l->t('Destination account')); ?> </td>
-					<td><input class="username-autocomplete" type="text" id="destination_account" name="destination_account"></td>
+					<td><input type="hidden" class="form-control account_mover_selector" id="destination_account"></td>
 				</tr>
 			</table>
 			<button class="success" id="move_credentials">Move</button>