Changeset 1185

Timestamp:

2008-09-23 15:13:32 (4 months ago)

Author:

gaspard

Message:

commit 167894872f3c023e527457ec541ed20b488c6889
Author: Gaspard Bucher <gaspard@teti.ch>

Cleanup (removed unused templates/files, removed 'monolingual' option as it is not supported and useless state:resolved tagged:wontfix, removed ZENA_ENV state:resolved) and fixed [icon] bug when the node contains an image (image selected instead of icon). There can be a priority set for the relationship by using 'l_id desc' order rule.

Files:

• trunk/app/controllers/application.rb (modified) (4 diffs)
• trunk/app/controllers/main_controller.rb (deleted)
• trunk/app/helpers/application_helper.rb (modified) (3 diffs)
• trunk/app/models/site.rb (modified) (5 diffs)
• trunk/app/views/main (deleted)
• trunk/app/views/nodes/404.html (added)
• trunk/app/views/nodes/500.html (added)
• trunk/app/views/nodes/_gallery.rhtml (added)
• trunk/app/views/nodes/_list_nodes.rhtml (added)
• trunk/app/views/nodes/save.rhtml (deleted)
• trunk/app/views/sites/_li.erb (modified) (1 diff)
• trunk/config/environment.rb (modified) (1 diff)
• trunk/config/routes.rb (modified) (1 diff)
• trunk/config/zena.rb (modified) (1 diff)
• trunk/db/migrate/000_zena/044_remove_monolingual_site_option.rb (added)
• trunk/db/schema.rb (modified) (1 diff)
• trunk/lib/node_query.rb (modified) (1 diff)
• trunk/lib/parser/lib/rules/zena.rb (modified) (1 diff)
• trunk/test/functional/application_controller_test.rb (modified) (1 diff)
• trunk/test/functional/main_controller_test.rb (deleted)
• trunk/test/helpers/zena_parser/relations.yml (modified) (1 diff)
• trunk/test/sites/complex/sites.yml (modified) (1 diff)
• trunk/test/sites/ocean/sites.yml (modified) (1 diff)
• trunk/test/sites/zena/sites.yml (modified) (1 diff)
• trunk/test/unit/site_test.rb (modified) (1 diff)

trunk/app/controllers/application.rb

@@ -54 +54 @@
-        # site not found
-        respond_to do |format|
-main
+nodes
-          format.all  { render :nothing => true, :status => "404 Not Found" }
-        end
@@ -76 +76 @@
-=end
-      respond_to do |format|
-main
+nodes
-        format.all  { render :nothing => true, :status => "500 Error" }
-      end
@@ -656 +656 @@
-        # force the use of a cacheable path for the data, even when navigating in '/oo'
-        # FIXME: we could use 'node.version.lang' if most of the time the version is loaded.
-(current_site[:monolingual] ? '' : node.v_lang)
+node.v_lang
-      else  
-        zen_path(node, opts.merge(:format => node.c_ext))
@@ -721 +721 @@
-    def prefix
-      if visitor.is_anon?
-
-
-
-
-
+
-      else
-        AUTHENTICATED_PREFIX

trunk/app/helpers/application_helper.rb

@@ -540 +540 @@
-    end
-    
-main
+nodes
-  end
-
@@ -572 +572 @@
-    end
-    return '' unless docs
-main
+nodes
-  end
-  
@@ -1244 +1244 @@
-  # show language selector
-  def lang_links(opts={})
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        else
-
-
-
-
-
+
-        end
-
-
-
+
+
+
+
+
+
+
+
+
-  end
-  

trunk/app/models/site.rb

@@ -11 +11 @@
-+name+::            Site name (used to display grouped information for cross sites users).
-+authorize+::       If this is set to true a login is required: anonymous visitor will not be allowed to browse the site as there is no login/password for the 'anonymous user'.
-+monolingual+::     Only use the +default_lang+. This will disable the language selection menu and will remove the language prefix from all urls.
-+allow_private+::   If set to true, users will be allowed to create private nodes (seen only by themselves).
-+languages+::       A comma separated list of the languages used for the current site. Do not insert spaces in this list.
- (or the unique language if +monolingual+ is true)
+
-=end
-class Site < ActiveRecord::Base
@@ -20 +19 @@
-  validates_uniqueness_of :host
-  # we are using 'attr_protected' instead of attr_accessible because we have dynamic attributes
-monolingual, :
+
-  has_many :groups, :order => "name"
-  has_many :nodes
@@ -28 +27 @@
-  
-  @@attributes_for_form = {
-monolingual, :
+
-    :text => [:name, :languages, :default_lang],
-  }
@@ -40 +39 @@
-        :name            => host.split('.').first,
-        :authentication  => false,
-        :monolingual     => false,
-        :allow_private   => false,
-        :auto_publish    => true,
@@ -231 +229 @@
-  end
-  
-  # Return true if the site is configured to use a single language
-  def monolingual?
-    self[:monolingual]
-  end
-  
-  # Return true if the site is configured to allow private nodes
-  def allow_private?

trunk/app/views/sites/_li.erb

@@ -10 +10 @@
-  <td class='site_group'  ><%= li.site_group.name   %></td>
-  <td class='redit_time'  ><%= li.redit_time %></td>
-[:authentication, :monolingual, :allow_private, :http_auth, :auto_publish
+Site.attributes_for_form[:bool
-</tr>

trunk/config/environment.rb

@@ -12 +12 @@
-require File.join(File.dirname(__FILE__), 'boot')
-
-Set ZENA_ENV
+Load zena specific settings
-require File.join(File.dirname(__FILE__), 'zena')
-require File.join(File.dirname(__FILE__), 'version')

trunk/config/routes.rb

@@ -60 +60 @@
-  map.resources :data_entries, :member => { :zafu => :get }
-
-  # FIXME monolingual
-  
-  #map.login  'login' , :controller=>'login', :action=>'login'
-  #map.logout 'logout', :controller=>'login', :action=>'logout'
-  #
-  #map.not_found '404', :controller=>'main', :action=>'not_found'
-  #
-  #map.user_home "#{AUTHENTICATED_PREFIX}/home", :controller=>'user', :action=>'home', :prefix=>"#{AUTHENTICATED_PREFIX}"
-  #
-  #map.connect ':prefix', :controller => "main", :action=>'index', :prefix=>/^(#{AUTHENTICATED_PREFIX}|\w\w)$/
-  #
-  #map.connect 'data/:ext/:version_id/:filename', :controller=>'document', :action=>'data'
-  #
-  #map.search 'z/search', :controller=>'search', :action=>'find'
-  #
-  #if ZENA_ENV[:monolingual]
-  #  map.connect '', :controller => "main", :action=>'index'
-  #  map.default 'z/:controller/:action/:id'
-  #  map.site_tree ':prefix/site_tree/:id', :controller=>'main', :action=>'site_tree', :prefix=>"#{AUTHENTICATED_PREFIX}"
-  #  map.connect ":prefix/*path", :controller=>'main', :action=>'show', :prefix=>"#{AUTHENTICATED_PREFIX}"
-  #  map.default 'z/:controller/:action/:id'
-  #  map.site_tree 'site_tree/:id', :controller=>'main', :action=>'site_tree', :prefix=>''
-  #  map.connect '*path', :controller=>'main', :action=>'show', :prefix=>''  
-  #else
-  #  map.site_tree ':prefix/site_tree/:id', :controller=>'main', :action=>'site_tree', :prefix=>/^(#{AUTHENTICATED_PREFIX}|\w\w)$/
-  #  map.connect ':prefix/*path', :controller=>'main', :action=>'show', :prefix=>/^(#{AUTHENTICATED_PREFIX}|\w\w)$/
-  #  map.default 'z/:controller/:action/:id'
-  #  map.connect '*path', :controller=>'main', :action=>'show'
-  #end
-  ## 
-  ## # Allow downloading Web Service WSDL as a file with an extension
-  ## # instead of a file named 'wsdl'
-  ## map.connect ':controller/service.wsdl', :action => 'wsdl'
-  ## 
-  ## # Install the default route as the lowest priority.
-  
-  # map.connect ':controller/:action/:id'
-  
-  # temporary routes...
-  map.connect 'discussions/:action/:id', :controller => 'discussions'
-  map.connect 'z/link/:action/:id', :controller => 'link'
-  map.connect 'z/link/:action', :controller => 'link'
-  map.redirect '/redirect', :controller => 'main', :action => 'redirect'
-  
-  # catch all
-  map.connect '*path',  :controller => 'nodes',    :action => 'catch_all'
-end
-=begin
-ActionController::Routing::Routes.draw do |map|
-  map.resources :relations
-
-  map.resources :links
-
-  # Add your own custom routes here.
-  # The priority is based upon order of creation: first created -> highest priority.
-  
-  # Here's a sample route:
-  # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # You can have the root of your site routed by hooking up '' 
-  # -- just remember to delete public/index.html.
-  
-end
-=end

trunk/config/zena.rb

@@ -22 +22 @@
-  puts "\n** WARNING: drb server not running. Upload progress will not work."
-  puts " * WARNING: you should start the drb server with 'lib/upload_progress_server.rb start'\n\n"
-end
-
-
-# FIXME: Remove ZENA_ENV, not needed anymore
-ZENA_ENV = {
-  :site_name => 'zena',
-  :root_id => 1,
-  :authorize => false,
-  :translate_group => 2, # default = admin
-  :monolingual => false,
-  :languages => ['en', 'fr', 'es'],
-  :calendar_langs => ["en", "fr"],
-  :default_lang => 'en',
- # :news_collector_id => 24,
- # :menu_tag_id => 23,
-  :pub_comments => false,      # do not open a public discussion by default
-  :allow_anonymous_comments    => true,
-  :moderate_anonymous_comments => true,
-  
-  :allow_private_nodes => false,
-  :password_salt => "fish zen ho",
-  :data_dir => "/var/www/zenadmin.org/data", # configure data directory for uploaded files
-  :edit_help_id => 3,
-}
-if ENV["RAILS_ENV"] != "test"
-  ZENA_ENV.freeze
-end
-

trunk/db/schema.rb

@@ -231 +231 @@
-    t.column "name",               :string
-    t.column "authentication",     :boolean
-    t.column "monolingual",        :boolean
-    t.column "allow_private",      :boolean
-    t.column "languages",          :string

trunk/lib/node_query.rb

@@ -202 +202 @@
-      when 'l_'  
-        key, function = parse_sql_function_in_field(field)
-
+ || (key == 'l_id' && context == :order)
-          @errors_unless_safe_links ||= []
-
+ unless (key == 'l_id' && context == :order)
-          # ok
-          function ? "#{function}(#{table('links')}.#{key[2..-1]})" : "#{table('links')}.#{key[2..-1]}"

trunk/lib/parser/lib/rules/zena.rb

@@ -1615 +1615 @@
-    def r_icon
-      if !@params[:in] && !@params[:where] && !@params[:from] && !@params[:find]
-
+, :order => 'l_id desc'
-        return unless finder
-        return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node)

trunk/test/functional/application_controller_test.rb

@@ -134 +134 @@
-  end
-  
-  def test_prefix
-    bak = ZENA_ENV[:monolingual]
-    ZENA_ENV[:monolingual] = false
-    @controller.instance_variable_set(:@session, :lang=>'en')
-    assert_equal 'en', @controller.send(:prefix)
-    @controller.instance_variable_set(:@session, :lang=>'ru')
-    assert_equal 'ru', @controller.send(:prefix)
-    @controller.instance_variable_set(:@session, :user=>{:id=>4, :lang=>'en', :groups=>[1,2,3]})
-    assert_equal AUTHENTICATED_PREFIX, @controller.send(:prefix)
-    ZENA_ENV[:monolingual] = true
-    @controller.instance_variable_set(:@session, :user=>nil)
-    assert_equal '', @controller.send(:prefix)
-    @controller.instance_variable_set(:@session, :user=>{:id=>4, :lang=>'en', :groups=>[1,2,3]})
-    assert_equal AUTHENTICATED_PREFIX, @controller.send(:prefix)
-    ZENA_ENV[:monolingual] = bak
-  end
-  
-  def test_bad_session_user
-    @controller.instance_variable_set(:@session, :user=>999, :host=>'test.host')

trunk/test/helpers/zena_parser/relations.yml

@@ -37 +37 @@
-    node: 'cleanWater'
-  src: "<r:icon do='[name]'/>"
+  tem: "/ORDER BY links.id DESC/"
-  res: "lake"
-  

trunk/test/sites/complex/sites.yml

@@ -7 +7 @@
-  site_group:      complex
-  authentication:  yes
-  monolingual:     no
-  allow_private:   no
-  auto_publish:    yes

trunk/test/sites/ocean/sites.yml

@@ -7 +7 @@
-  site_group:      aqua
-  authentication:  no
-  monolingual:     no
-  allow_private:   no
-  auto_publish:    no

trunk/test/sites/zena/sites.yml

@@ -7 +7 @@
-  site_group:      workers
-  authentication:  no
-  monolingual:     no
-  allow_private:   yes
-  auto_publish:    no

trunk/test/unit/site_test.rb

@@ -172 +172 @@
-  end
-  
-  def test_monolingual
-    site = sites(:zena)
-    assert !site.monolingual?, "Multi lang site"
-    site.monolingual = true
-    assert site.save, "Can save"
-    assert site.monolingual?, "Mono lang site"
-  end
-  
-  def test_allow_private
-    site = sites(:zena)