Fixed 'unknown this' bug in [calendar] when rendering in a [block].

zena · Nov 16, 2011 · 35710ef · 35710ef
1 parent bfbc336
commit 35710ef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/History.txt b/History.txt
@@ -6,6 +6,7 @@
 * Minor changes
  * Enabled Acl during document upload.
  * Fixed a bug when using [edit] in a list with [add].
+ * Fixed 'unknown this' bug in [calendar] when rendering in a [block].
 
 == 1.1.3 2011-11-09
 

diff --git a/lib/zena/use/calendar.rb b/lib/zena/use/calendar.rb
@@ -330,6 +330,8 @@ def make_calendar(opts)
               # HACK to render sub-elements...
               bak = @blocks
                 @blocks = opts[:cell].blocks
+                # reset saved scope
+                @context[:saved_template] = nil
                 cell_code   = expand_if(var, node.move_to(var, [klass]))
               @blocks = bak
             @markup = markup

diff --git a/lib/zena/use/dates.rb b/lib/zena/use/dates.rb
@@ -163,7 +163,7 @@ def main_date(tz = visitor.tz)
           @main_dates ||= {}
           @main_dates[tz] ||= begin
             if params[:date]
-              if date = params[:date].to_utc(ISO_DATE_FORMAT, tz)
+              if date = params[:date].to_utc(_(DATETIME), tz)
                 date
               else
                 # FIXME: when date parsing fails: show an error, not a 500...