fix merge errors and some tests

This commit is contained in:
Reinier Balt 2010-11-09 15:13:22 +01:00
parent 0f525436ff
commit f2d977e12a
7 changed files with 17 additions and 34 deletions

View file

@ -8,12 +8,6 @@
TracksForm.show_errors(html_for_error_messages());
<% end -%>
/*
if @saved
container_name = 'list-contexts-' + (@context.hidden? ? 'hidden' : 'active')
page.insert_html :bottom, container_name, :partial => 'context_listing', :locals => { :context_listing => @context }
*/
function hide_empty_message() {
$('contexts-empty-nd').hide();
}