From 6d66406d8c0e947c1878a8fa95bf6d6e47ba665f Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Fri, 11 Feb 2011 16:18:59 +0100 Subject: [PATCH] fix #1103. The xml output contained an unintended empty context --- app/controllers/contexts_controller.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb index 3dcf663a..6e6cd265 100644 --- a/app/controllers/contexts_controller.rb +++ b/app/controllers/contexts_controller.rb @@ -13,13 +13,18 @@ class ContextsController < ApplicationController # checks later don't result in separate SQL queries @active_contexts = current_user.contexts.active(true) @hidden_contexts = current_user.contexts.hidden(true) - @count = @active_contexts.size + @hidden_contexts.size @new_context = current_user.contexts.build + + # save all contexts here as @new_context will add an empty one to current_user.contexts + @all_contexts = @active_contexts + @hidden_contexts + @count = @all_contexts.size + + init_not_done_counts(['context']) respond_to do |format| format.html &render_contexts_html format.m &render_contexts_mobile - format.xml { render :xml => current_user.contexts.to_xml( :except => :user_id ) } + format.xml { render :xml => @all_contexts.to_xml( :except => :user_id ) } format.rss &render_contexts_rss_feed format.atom &render_contexts_atom_feed format.text do