From 1a62ce55e37d89c558ece7d251e506b283c505ea Mon Sep 17 00:00:00 2001 From: wvengen Date: Fri, 8 May 2015 20:54:48 +0200 Subject: [PATCH] Fix task form --- app/views/tasks/_form.html.haml | 2 ++ app/views/tasks/_form_javascript.html.haml | 14 ++++++++++++++ app/views/tasks/_form_sidebar.html.haml | 13 ------------- 3 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 app/views/tasks/_form_javascript.html.haml diff --git a/app/views/tasks/_form.html.haml b/app/views/tasks/_form.html.haml index 077836ba..56da25b7 100644 --- a/app/views/tasks/_form.html.haml +++ b/app/views/tasks/_form.html.haml @@ -9,3 +9,5 @@ = form.input :due_date, as: :date_picker - unless local_assigns[:periodic] = form.input :done + += render 'form_javascript' diff --git a/app/views/tasks/_form_javascript.html.haml b/app/views/tasks/_form_javascript.html.haml new file mode 100644 index 00000000..7fb24451 --- /dev/null +++ b/app/views/tasks/_form_javascript.html.haml @@ -0,0 +1,14 @@ +- content_for :javascript do + :javascript + $(function() { + $("#task_user_list").tokenInput("#{users_path(:format => :json)}", { + crossDomain: false, + prePopulate: $("#task_user_list").data("pre"), + hintText: '#{escape_javascript(t('tasks.form.search.hint'))}', + noResultText: '#{escape_javascript(t('tasks.form.search.noresult'))}', + searchingText: '#{escape_javascript(t('tasks.form.search.placeholder'))}', + theme: 'facebook' + }); + }); + + diff --git a/app/views/tasks/_form_sidebar.html.haml b/app/views/tasks/_form_sidebar.html.haml index c32a6c94..9774cdc2 100644 --- a/app/views/tasks/_form_sidebar.html.haml +++ b/app/views/tasks/_form_sidebar.html.haml @@ -1,15 +1,2 @@ -- content_for :javascript do - :javascript - $(function() { - $("#task_user_list").tokenInput("#{users_path(:format => :json)}", { - crossDomain: false, - prePopulate: $("#task_user_list").data("pre"), - hintText: '#{escape_javascript(t('.search.hint'))}', - noResultText: '#{escape_javascript(t('.search.noresult'))}', - searchingText: '#{escape_javascript(t('.search.placeholder'))}', - theme: 'facebook' - }); - }); - - content_for :sidebar do = render "shared/workgroup_members"