From 0e2366233afd9ed201841e932757f96f4dd2ebb2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 24 Jan 2018 13:39:48 +0100
Subject: [PATCH] Start fixing Select2 options

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../js/usergroupmembershipplugin.js            | 18 +++++++++++++-----
 settings/js/settings.js                        |  8 +++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/workflowengine/js/usergroupmembershipplugin.js b/apps/workflowengine/js/usergroupmembershipplugin.js
index 1c09e7d5cc..10f2382db2 100644
--- a/apps/workflowengine/js/usergroupmembershipplugin.js
+++ b/apps/workflowengine/js/usergroupmembershipplugin.js
@@ -64,11 +64,11 @@
 
 						// add admin groups
 						$.each(response.data.adminGroups, function(id, group) {
-							results.push({ id: group.id });
+							results.push({ id: group.id, displayname: group.name });
 						});
 						// add groups
 						$.each(response.data.groups, function(id, group) {
-							results.push({ id: group.id });
+							results.push({ id: group.id, displayname: group.name });
 						});
 
 						// TODO once limit and offset is implemented for groups we should paginate the search results
@@ -79,13 +79,21 @@
 					}
 				},
 				initSelection: function (element, callback) {
-					callback({id: element.val()});
+					var groupId = element.val();
+					if (groupId) {
+						callback({
+							id: groupId,
+							displayname: groupId + 'FIXME' // FIXME
+						});
+					} else {
+						callback();
+					}
 				},
 				formatResult: function (element) {
-					return '<span>' + escapeHTML(element.id) + '</span>';
+					return '<span>' + escapeHTML(element.displayname) + '</span>';
 				},
 				formatSelection: function (element) {
-					return '<span title="'+escapeHTML(element.id)+'">'+escapeHTML(element.id)+'</span>';
+					return '<span title="'+escapeHTML(element.id)+'">'+escapeHTML(element.displayname)+'</span>';
 				}
 			});
 		}
diff --git a/settings/js/settings.js b/settings/js/settings.js
index 3a1e67f41c..ad0ab758e9 100644
--- a/settings/js/settings.js
+++ b/settings/js/settings.js
@@ -73,12 +73,10 @@ OC.Settings = _.extend(OC.Settings, {
 					return element.id;
 				},
 				initSelection: function(element, callback) {
-					var selection =
-						_.map(($(element).val() || []).split('|').sort(),
-							function(groupName) {
+					var selection = _.map(($(element).val() || []).split('|').sort(), function(groupId) {
 						return {
-							id: groupName,
-							displayname: groupName
+							id: groupId,
+							displayname: groupId + 'FIXME' // FIXME
 						};
 					});
 					callback(selection);