fix the deprecation warnings that were shown during the tests

This commit is contained in:
Reinier Balt 2011-01-07 16:46:20 +01:00
parent a832417c59
commit 09830d044d
13 changed files with 23 additions and 22 deletions

View file

@ -5,7 +5,7 @@
<% end -%>
<%= project.name -%></h2>
<div id="<%= dom_id(project, "container")%>">
<%= render :partial => "projects/project_settings", :locals => { :project => project, :collapsible => collapsible } %>
<%= render :partial => "projects/project_settings", :object => project, :locals => { :collapsible => collapsible } %>
</div>
</div>

View file

@ -1,3 +1,4 @@
<% project = project_settings -%>
<div id="<%= dom_id(project) %>" class="project">
<div class="project_settings">This project
<% if project.completed? -%>has been marked as completed

View file

@ -41,5 +41,5 @@ function html_for_error_messages() {
}
function html_for_project_listing() {
return "<%= @saved ? escape_javascript(render(:partial => 'project_listing', :locals => { :project_listing => @project })) : "" %>";
return "<%= @saved ? escape_javascript(render(:partial => 'project_listing', :object => @project)) : "" %>";
}

View file

@ -17,5 +17,5 @@ function set_focus() {
}
function html_for_edit_form() {
return "<%= escape_javascript(render(:partial => 'project_form', :locals => { :project_form => @project })) %>"
return "<%= escape_javascript(render(:partial => 'project_form', :object => @project)) %>"
}

View file

@ -4,7 +4,7 @@
</div>
<%= render :partial => @project, :locals => {:collapsible => false } %>
<%= render :partial => "todos/deferred", :locals => { :deferred => @deferred, :collapsible => false, :append_descriptor => t('projects.todos_append'), :parent_container_type => 'project', :pending => @pending } %>
<%= render :partial => "todos/deferred", :object => @deferred, :locals => { :collapsible => false, :append_descriptor => t('projects.todos_append'), :parent_container_type => 'project', :pending => @pending } %>
<% unless @max_completed==0 -%>
<%= render :partial => "todos/completed", :object => @done, :locals => { :collapsible => false, :suppress_project => true, :append_descriptor => t('projects.todos_append') } %>
<% end -%>

View file

@ -71,7 +71,7 @@ function remove_and_re_add_project() {
# render it into the function.
-%>
function html_for_project_listing() {
return "<%= source_view_is(:project_list) ? escape_javascript(render(:partial => 'project_listing', :locals => { :project_listing => @project })) : "" %>";
return "<%= source_view_is(:project_list) ? escape_javascript(render(:partial => 'project_listing', :object => @project )) : "" %>";
}
function html_for_sidebar() {
@ -79,7 +79,7 @@ function html_for_sidebar() {
}
function html_for_project_settings() {
return "<%= source_view_is(:project) ? escape_javascript(render(:partial => 'project_settings', :locals => { :project => @project })) : "" %>";
return "<%= source_view_is(:project) ? escape_javascript(render(:partial => 'project_settings', :object => @project )) : "" %>";
}
function html_for_error_messages() {