hobo_files/plugin/lib/hobo/controller.rb in hobo-0.6.1 vs hobo_files/plugin/lib/hobo/controller.rb in hobo-0.6.2
- old
+ new
@@ -81,12 +81,12 @@
end
def render_tag(tag, options={}, render_options={})
add_variables_to_assigns
- render({:text => Hobo::Dryml.render_tag(@template, tag, options),
- :layout => false }.merge(render_options))
+ text = Hobo::Dryml.render_tag(@template, tag, options)
+ text && render({:text => text, :layout => false }.merge(render_options))
end
def render_tags(objects, tag, options={})
for_type = options.delete(:for_type)
@@ -96,11 +96,11 @@
results = objects.map do |o|
tag = dryml_renderer.find_polymorphic_tag(tag, o.class) if for_type
dryml_renderer.send(tag, options.merge(:with => o))
end.join
- render :text => results + dryml_renderer.part_contexts_js
+ render :text => results + dryml_renderer.part_contexts_storage
end
def site_search(query)
results = Hobo.find_by_search(query).select {|r| Hobo.can_view?(current_user, r, nil)}
@@ -112,10 +112,10 @@
end
# Store the given user in the session.
def current_user=(new_user)
- session[:user] = (new_user.nil? || new_user.is_a?(Symbol)) ? nil : new_user.typed_id
+ session[:user] = (new_user.nil? || new_user.guest?) ? nil : new_user.typed_id
@current_user = new_user
end
def request_no_cache?