From 0353c691dd219038b66216ecfc19c282cc98f439 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Mon, 27 Feb 2017 13:08:00 +0100
Subject: [PATCH] Broken paging on the Add approver form #662

---
 app/views/dmsf_workflows/_action.html.erb             | 7 +++++--
 app/views/dmsf_workflows/_new_step_form.html.erb      | 9 ++++-----
 app/views/dmsf_workflows/autocomplete_for_user.js.erb | 2 +-
 config/locales/cs.yml                                 | 4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/views/dmsf_workflows/_action.html.erb b/app/views/dmsf_workflows/_action.html.erb
index d85c564b..f88a2bd4 100644
--- a/app/views/dmsf_workflows/_action.html.erb
+++ b/app/views/dmsf_workflows/_action.html.erb
@@ -44,8 +44,11 @@
   <p>
     <%= label_tag 'delegate', l(:label_dmsf_wokflow_action_delegate) %><br/>
     <%= text_field_tag 'user_search', nil %>    
-    <%= javascript_tag "observeSearchfield('user_search', 'dmsf_users_for_delegate', '#{ escape_javascript autocomplete_for_user_dmsf_workflow_path(@dmsf_workflow, :dmsf_workflow_step_assignment_id => params[:dmsf_workflow_step_assignment_id], :dmsf_file_revision_id => params[:dmsf_file_revision_id]) }')" %>    
-    <%= content_tag('div', principals_radio_button_tags('step_action', @dmsf_workflow.delegates(nil, params[:dmsf_workflow_step_assignment_id], params[:dmsf_file_revision_id])), :id => 'dmsf_users_for_delegate') %>
+    <%= javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_dmsf_workflow_path(@dmsf_workflow, :dmsf_workflow_step_assignment_id => params[:dmsf_workflow_step_assignment_id], :dmsf_file_revision_id => params[:dmsf_file_revision_id]) }')" %>
+    <div id="dmsf_users_for_delegate">
+      <%= render_principals_for_new_dmsf_workflow_users(
+        @dmsf_workflow, params[:dmsf_workflow_step_assignment_id], params[:dmsf_file_revision_id]) %>
+    </div>
   </p>
   
   <p class="buttons">
diff --git a/app/views/dmsf_workflows/_new_step_form.html.erb b/app/views/dmsf_workflows/_new_step_form.html.erb
index cf9cc137..434bde75 100644
--- a/app/views/dmsf_workflows/_new_step_form.html.erb
+++ b/app/views/dmsf_workflows/_new_step_form.html.erb
@@ -23,9 +23,8 @@
 <fieldset class="box">
   <legend><%= l(:label_dmsf_workflow_add_approver) %></legend>
   <p><%= label_tag 'user_search', l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>    
-  <%= javascript_tag "observeSearchfield('user_search', 'users', '#{ escape_javascript autocomplete_for_user_dmsf_workflow_path(@dmsf_workflow, :dmsf_workflow_step_assignment_id => nil, :dmsf_file_revision_id => nil, :project_id => @project ? @project.id : nil) }')" %>
-
-  <div id="new_approvers">
+  <%= javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_dmsf_workflow_path(@dmsf_workflow, :dmsf_workflow_step_assignment_id => nil, :dmsf_file_revision_id => nil, :project_id => @project ? @project.id : nil) }')" %>
+  <div id="dmsf_users_for_delegate">
     <%= render_principals_for_new_dmsf_workflow_users(@dmsf_workflow) %>
   </div>
 </fieldset>
@@ -33,9 +32,9 @@
 <fieldset class="box">
   <legend><%= l(:label_dmsf_workflow_step) %></legend>
   <%= select_tag 'step', dmsf_workflow_steps_options_for_select(@steps),
-    :id => 'selected_step', :onchange => "$('#dmsf_step_name').toggle(this.value == 0);", :style => 'max-width: 40%'  %>
+    :id => 'selected_step', :onchange => "$('#dmsf_step_name').toggle(this.value == 0);", :style => 'max-width: 40%' %>
   <span id="dmsf_step_name">&nbsp;
     <%= label_tag 'name', l(:field_name) %>
-    <%= text_field_tag 'name', nil, :maxlength => 30, :style => 'max-width: 40%'  %>
+    <%= text_field_tag 'name', nil, :maxlength => 30, :style => 'max-width: 40%' %>
   </span>
 </fieldset>
diff --git a/app/views/dmsf_workflows/autocomplete_for_user.js.erb b/app/views/dmsf_workflows/autocomplete_for_user.js.erb
index 43bb57a9..f137ae32 100644
--- a/app/views/dmsf_workflows/autocomplete_for_user.js.erb
+++ b/app/views/dmsf_workflows/autocomplete_for_user.js.erb
@@ -1,3 +1,3 @@
-$('#new_approvers').html('<%= escape_javascript(
+$('#dmsf_users_for_delegate').html('<%= escape_javascript(
   render_principals_for_new_dmsf_workflow_users(
     @dmsf_workflow, params[:dmsf_workflow_step_assignment_id], params[:dmsf_file_revision_id])) %>');
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index dc7ddc0d..b8707c60 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -357,5 +357,5 @@ cs:
   note_global: (globální)
   field_dmsf_not_inheritable: Není dědičné
   
-  label_webdav_use_project_names: Use project name for project folder
-  note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+  label_webdav_use_project_names: Použít názvy projektů
+  note_webdav_use_project_names: Použít názvy projektů místo identifikátorů pro názvy adresářů.