1.1 --- a/model/draft.lua	Mon Feb 13 01:53:41 2012 +0100
     1.2 +++ b/model/draft.lua	Thu Feb 16 14:08:43 2012 +0100
     1.3 @@ -23,45 +23,4 @@
     1.4    return self.author and self.author.name or _"Unknown author"
     1.5  end
     1.6  
     1.7 --- render draft to html, save it as rendered_draft and return it
     1.8 -function Draft.object:render_content()
     1.9 -  -- local draft for update
    1.10 -  local draft_lock = Draft:new_selector()
    1.11 -    :add_where{ "id = ?", self.id }
    1.12 -    :single_object_mode()
    1.13 -    :for_update()
    1.14 -    :exec()
    1.15 -  -- check if there is already a rendered draft
    1.16 -  local rendered_draft = RenderedDraft:new_selector()
    1.17 -    :add_where{ "draft_id = ?", self.id }
    1.18 -    :add_where{ "format = 'html'" }
    1.19 -    :optional_object_mode()
    1.20 -    :exec()
    1.21 -  if rendered_draft then
    1.22 -    return rendered_draft
    1.23 -  end
    1.24 -  -- create rendered_draft record
    1.25 -  local rendered_draft = RenderedDraft:new()
    1.26 -  rendered_draft.draft_id = self.id
    1.27 -  rendered_draft.format = "html"
    1.28 -  rendered_draft.content = format.wiki_text(self.content, self.formatting_engine)
    1.29 -  rendered_draft:save()
    1.30 -  -- and return it
    1.31 -  return rendered_draft
    1.32 -end
    1.33 -
    1.34 --- returns rendered version of draft for specific format
    1.35 -function Draft.object:get_content(format)
    1.36 -  -- Fetch rendered_draft record for specified format
    1.37 -  local rendered_draft = RenderedDraft:new_selector()
    1.38 -    :add_where{ "draft_id = ?", self.id }
    1.39 -    :add_where{ "format = ?", format }
    1.40 -    :optional_object_mode()
    1.41 -    :exec()
    1.42 -  -- If this format isn't rendered yet, render it
    1.43 -  if not rendered_draft then
    1.44 -    rendered_draft = self:render_content()
    1.45 -  end
    1.46 -  -- return rendered content
    1.47 -  return rendered_draft.content
    1.48 -end
    1.49 \ No newline at end of file
    1.50 +model.has_rendered_content(Draft, RenderedDraft)