From d5a64cbbe304aac2a7fe61b325cd169843a7f0a9 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Mon, 10 Apr 2017 16:18:32 +0200
Subject: [PATCH] #170 user autocomplete fix

---
 app/controllers/dmsf_folder_permissions_controller.rb         | 4 +++-
 app/helpers/dmsf_folder_permissions_helper.rb                 | 4 ++++
 app/views/dmsf_folder_permissions/_new.html.erb               | 2 +-
 .../dmsf_folder_permissions/autocomplete_for_user.html.erb    | 1 -
 .../dmsf_folder_permissions/autocomplete_for_user.js.erb      | 2 ++
 5 files changed, 10 insertions(+), 3 deletions(-)
 delete mode 100644 app/views/dmsf_folder_permissions/autocomplete_for_user.html.erb
 create mode 100644 app/views/dmsf_folder_permissions/autocomplete_for_user.js.erb

diff --git a/app/controllers/dmsf_folder_permissions_controller.rb b/app/controllers/dmsf_folder_permissions_controller.rb
index 41d64259..616bbdd8 100644
--- a/app/controllers/dmsf_folder_permissions_controller.rb
+++ b/app/controllers/dmsf_folder_permissions_controller.rb
@@ -36,7 +36,9 @@ class DmsfFolderPermissionsController < ApplicationController
 
   def autocomplete_for_user
     @users = users_for_new_users
-    render :layout => false
+    respond_to do |format|
+      format.js
+    end
   end
 
   private
diff --git a/app/helpers/dmsf_folder_permissions_helper.rb b/app/helpers/dmsf_folder_permissions_helper.rb
index 8c8b6a85..4e0b6124 100644
--- a/app/helpers/dmsf_folder_permissions_helper.rb
+++ b/app/helpers/dmsf_folder_permissions_helper.rb
@@ -11,4 +11,8 @@ module DmsfFolderPermissionsHelper
     s.html_safe
   end
 
+  def render_principals_for_new_folder_permissions(users)
+    principals_check_box_tags 'user[user_ids][]', users
+  end
+
 end
diff --git a/app/views/dmsf_folder_permissions/_new.html.erb b/app/views/dmsf_folder_permissions/_new.html.erb
index cec53a97..c3b9d617 100644
--- a/app/views/dmsf_folder_permissions/_new.html.erb
+++ b/app/views/dmsf_folder_permissions/_new.html.erb
@@ -12,7 +12,7 @@
                  :project_id => @project) }')" %>
 
   <div id="users_for_watcher">
-    <%= principals_check_box_tags('user_ids[]', users) %>
+    <%= render_principals_for_new_folder_permissions(@users) %>
   </div>
 
   <p class="buttons">
diff --git a/app/views/dmsf_folder_permissions/autocomplete_for_user.html.erb b/app/views/dmsf_folder_permissions/autocomplete_for_user.html.erb
deleted file mode 100644
index d4060517..00000000
--- a/app/views/dmsf_folder_permissions/autocomplete_for_user.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= principals_check_box_tags 'user[user_ids][]', @users %>
diff --git a/app/views/dmsf_folder_permissions/autocomplete_for_user.js.erb b/app/views/dmsf_folder_permissions/autocomplete_for_user.js.erb
new file mode 100644
index 00000000..9662f6af
--- /dev/null
+++ b/app/views/dmsf_folder_permissions/autocomplete_for_user.js.erb
@@ -0,0 +1,2 @@
+$('#users_for_watcher').html('<%= escape_javascript(
+  render_principals_for_new_folder_permissions(@users)) %>');