deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed an incompatibility with old storages; ticket:133

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-05-02 01:43:44 +00:00
parent ee396a3237
commit c0e5673cc5
2 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -1,10 +1,9 @@
* 0.10.1: * 0.10.1:
Upgraded Rails to 0.12.0 Upgraded Rails to 0.12.0
Upgraded rubyzip to version 0.5.8 Upgraded rubyzip to version 0.5.8
BlueCloth is back (RedCloth didn't do pure Markdown well enough to replace it yet) BlueCloth is back (RedCloth didn't do pure Markdown well enough)
Handling of line breaks in Textile is as in 0.9 (inserts <br/> tag) Handling of line breaks in Textile is as in 0.9 (inserts <br/> tag)
Fixed HTML export (to enclose the output in <html> tags, include the stylesheet etc) Fixed HTML export (to enclose the output in <html> tags, include the stylesheet etc)
Some other bug fixes Some other bug fixes
* 0.10.0: * 0.10.0:

44
app/models/web.rb
View file

@ -5,30 +5,45 @@ require 'wiki_words'
require 'zip/zip' require 'zip/zip'
class Web class Web
attr_accessor :name, :password, :markup, :color, :safe_mode, :pages attr_accessor :name, :password, :safe_mode, :pages
attr_accessor :additional_style, :published, :brackets_only, :count_pages, :allow_uploads attr_accessor :additional_style, :allow_uploads, :published
attr_accessor :max_upload_size
attr_reader :address attr_reader :address
# there are getters for all these attributes, too
attr_writer :markup, :color, :brackets_only, :count_pages, :max_upload_size
def initialize(parent_wiki, name, address, password = nil) def initialize(parent_wiki, name, address, password = nil)
self.address = address self.address = address
@wiki, @name, @password = parent_wiki, name, password @wiki, @name, @password = parent_wiki, name, password
# default values set_compatible_defaults
@markup = :textile
@color = '008B26'
@safe_mode = false
@pages = {} @pages = {}
@allow_uploads = true @allow_uploads = true
@additional_style = nil @additional_style = nil
@published = false @published = false
@brackets_only = false
@count_pages = false @count_pages = false
@allow_uploads = true @allow_uploads = true
@max_upload_size = 100
end end
# Explicitly sets value of some web attributes to defaults, unless they are already set
def set_compatible_defaults
@markup = markup()
@color = color()
@safe_mode = safe_mode()
@brackets_only = brackets_only()
@max_upload_size = max_upload_size()
@wiki = wiki
end
# All below getters know their default values. This is necessary to ensure compatibility with
# 0.9 storages, where they were not defined.
def brackets_only() @brackets_only || false end
def color() @color ||= '008B26' end
def count_pages() @count_pages || false end
def markup() @markup ||= :textile end
def max_upload_size() @max_upload_size || 100; end
def wiki() @wiki ||= WikiService.instance; end
def add_page(page) def add_page(page)
@pages[page.name] = page @pages[page.name] = page
end end
@ -129,10 +144,6 @@ class Web
end end
end end
def max_upload_size
@max_upload_size || 100
end
# Clears the display cache for all the pages with references to # Clears the display cache for all the pages with references to
def refresh_pages_with_references(page_name) def refresh_pages_with_references(page_name)
select.pages_that_reference(page_name).each { |page| select.pages_that_reference(page_name).each { |page|
@ -156,11 +167,6 @@ class Web
PageSet.new(self, @pages.values, condition) PageSet.new(self, @pages.values, condition)
end end
# This ensures compatibility with 0.9 storages
def wiki
@wiki ||= WikiService.instance
end
private private
# Returns an array of all the wiki words in any current revision # Returns an array of all the wiki words in any current revision