diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-04-18 16:04:13 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-04-18 16:04:13 +0000 |
| commit | 42532605db5abd5608ce6cff6cc4da91f49a8e64 (patch) | |
| tree | 9f2781b1c0368bbf0f4ad018058e2260b5c79010 /app | |
| parent | a7ed8bcbedbf49593d7a9135643ea6f712cea2d2 (diff) | |
| download | redmine-42532605db5abd5608ce6cff6cc4da91f49a8e64.tar.gz redmine-42532605db5abd5608ce6cff6cc4da91f49a8e64.zip | |
Update Rails ujs (#31205).
Patch by Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@18062 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/my_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/my/page.html.erb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1eef95100..3712b8a05 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1518,7 +1518,7 @@ module ApplicationHelper # Returns the javascript tags that are included in the html layout head def javascript_heads - tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-4.3.1', 'application', 'responsive') + tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-5.2.3', 'application', 'responsive') unless User.current.pref.warn_on_leaving_unsaved == '0' tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });") end diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb index f54214787..67a57faaa 100644 --- a/app/helpers/my_helper.rb +++ b/app/helpers/my_helper.rb @@ -37,7 +37,7 @@ module MyHelper handle = content_tag('span', '', :class => 'sort-handle', :title => l(:button_move)) close = link_to(l(:button_delete), {:action => "remove_block", :block => block}, - :remote => true, :method => 'post', + :remote => true, :method => 'post', :class => "icon-only icon-close", :title => l(:button_delete)) content = content_tag('div', handle + close, :class => 'contextual') + content diff --git a/app/views/my/page.html.erb b/app/views/my/page.html.erb index c56e03c17..f7a2f5577 100644 --- a/app/views/my/page.html.erb +++ b/app/views/my/page.html.erb @@ -1,5 +1,5 @@ <div class="contextual"> - <%= form_tag({:action => "add_block"}, :remote => true, :id => "block-form") do %> + <%= form_tag({:action => "add_block"}, :remote => true, :id => "block-form", authenticity_token: true) do %> <%= label_tag('block-select', l(:button_add)) %>: <%= block_select_tag(@user) %> <% end %> |