dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to Rails 3.2.8 (#11758).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10275 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-09-02 10:08:51 +00:00
parent 139ddd639f
commit 265baa1b2c
18 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helpers/application_helper.rb
+1 -1
View File
@@ -1206,7 +1206,7 @@ module ApplicationHelper
# Returns the javascript tags that are included in the html layout head
def javascript_heads
tags = javascript_include_tag('jquery-1.7.2-ui-1.8.21-ujs-2.0.2', 'application')
tags = javascript_include_tag('jquery-1.7.2-ui-1.8.21-ujs-2.0.3', 'application')
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
app/views/groups/edit_membership.js.erb
+1 -1
View File
@@ -2,5 +2,5 @@
$('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'groups/memberships') %>');
$('#member-<%= @membership.id %>').effect("highlight");
<% else %>
alert('<%= escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', '))) %>');
alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))) %>');
<% end %>
app/views/members/create.js.erb
+1 -1
View File
@@ -7,5 +7,5 @@ hideOnLoad();
<% end %>
<% else %>
<% errors = @members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') %>
alert('<%= escape_javascript l(:notice_failed_to_save_members, :errors => errors) %>');
alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => errors))) %>');
<% end %>
app/views/repositories/add_related_issue.js.erb
+1 -1
View File
@@ -3,5 +3,5 @@
$('#related-issue-<%= @issue.id %>').effect("highlight");
$('#issue_id').focus();
<% else %>
alert("<%= escape_javascript(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid')) %>");
alert("<%= raw(escape_javascript(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid'))) %>");
<% end %>
app/views/users/edit_membership.js.erb
+1 -1
View File
@@ -2,5 +2,5 @@
$('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'users/memberships') %>');
$("#member-<%= @membership.id %>").effect("highlight");
<% else %>
alert('<%= escape_javascript l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')) %>');
alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))) %>');
<% end %>