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 @@

<%= label_tag 'delegate', l(:label_dmsf_wokflow_action_delegate) %>
<%= 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]) }')" %> +

+ <%= render_principals_for_new_dmsf_workflow_users( + @dmsf_workflow, params[:dmsf_workflow_step_assignment_id], params[:dmsf_file_revision_id]) %> +

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 @@

<%= l(:label_dmsf_workflow_add_approver) %>

<%= label_tag 'user_search', l(:label_user_search) %><%= text_field_tag 'user_search', nil %>

- <%= 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) }')" %> - -
+ <%= 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) }')" %> +
<%= render_principals_for_new_dmsf_workflow_users(@dmsf_workflow) %>
@@ -33,9 +32,9 @@
<%= l(:label_dmsf_workflow_step) %> <%= 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%' %>   <%= 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%' %>
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ářů.