Random fixes to get the initial page loading

plus login and signup screens being displayed. They don't work yet, though.

Random fixes to get the initial page loading
plus login and signup screens being displayed. They don't work yet, though.
Antonio Terceiro
1 parent 19a038f4
Showing 17 changed files with 87 additions and 57 deletions Show diff stats
MIGRATION_ISSUES
app/helpers/application_helper.rb
app/helpers/countries_helper.rb
app/models/article.rb
app/models/communities_block.rb
app/models/domain.rb
app/models/login_block.rb
app/models/people_block.rb
app/models/profile_list_block.rb
app/views/account/_signup_form.html.erb
app/views/account/login.html.erb
app/views/account/login_block.html.erb
app/views/layouts/_javascript.html.erb
app/views/layouts/application-ng.html.erb
config/application.rb
config/routes.rb
lib/environment_domain_constraint.rb
@@ -22,7 +22,7 @@
 * check FIXME's in Gemfile
-* rewrite config/routes.rb
+* Finish rewriting config/routes.rb (look for __END__)
 * rewrite conditional routing. See FIXME in lib/route_if.rb and re-implement using the Rails 3 mechanism - http://guides.rubyonrails.org/routing.html#advanced-constraints
@@ -30,4 +30,12 @@
 * xss_terminate sucks. We should replace it with the builtin mechanism in Rails 3
-* instance_eval on Ruby 1.9 yields self, so lambdas that are passed to instance_eval and do not accept exactly 1 argument will blow up. See http://www.ruby-forum.com/topic/213313 ... search for instance_eval and fix where necessary.
+* instance_eval on Ruby 1.9 yields self, so lambdas that are passed to instance_eval and do not accept exactly 1 argument will blow up. See http://www.ruby-forum.com/topic/213313 ... search for instance_eval and fix where necessary. In special, most of the blocks still need fixing.
+
+* all instances of <% *_form_for ... %> must be changed to <%= instead of <%
+
+* all ActiveRecord models have to declare explicitly which attributes must be allowed for mass assignment with attr_accessible.
+
+* check if we need to update config/locales/*
+
+* check observe_field and labelled_form_for in app/helpers/application_helper.rb
@@ -826,8 +826,8 @@ module ApplicationHelper
   end
   def labelled_form_for(name, object = nil, options = {}, &proc)
-    object ||= instance_variable_get("@#{name}")
-    form_for(name, object, { :builder => NoosferoFormBuilder }.merge(options), &proc)
+    # FIXME remove the =object= argument and adapt the calling code
+    form_for(name, { :builder => NoosferoFormBuilder }.merge(options), &proc)
   end
   def optional_field(profile, name, field_html = nil, only_required = false, &block)
@@ -1409,4 +1409,28 @@ module ApplicationHelper
     options[:class] = "comment-footer comment-footer-link comment-footer-hide"
     expirable_content_reference content, action, text, url, options
   end
+
+  def error_messages_for(*args)
+    options = args.pop if args.last.is_a?(Hash)
+    errors = []
+    args.each do |name|
+      object = instance_variable_get("@#{name}")
+      object.errors.full_messages.each do |msg|
+        errors << msg
+      end
+    end
+    return '' if errors.empty?
+
+    content_tag(:div, :class => 'errorExplanation', :id => 'errorExplanation') do
+      content_tag(:h2, _('Errors while saving')) +
+      content_tag(:ul) do
+        errors.map { |err| content_tag(:li, err) }
+      end
+    end
+  end
+
+  # FIXME
+  def observe_field(*args)
+    ''
+  end
 end
@@ -267,7 +267,7 @@ module CountriesHelper
   end
   def countries
-    self.class.countries.map {|item| [gettext(item[0]), item[1] ]}.sort_by { |entry| entry.first.transliterate }
+    CountriesHelper.countries.map {|item| [gettext(item[0]), item[1] ]}.sort_by { |entry| entry.first.transliterate }
   end
   def lookup(code)
@@ -219,13 +219,6 @@ class Article &lt; ActiveRecord::Base
       limit(limit).
       order(['articles.published_at desc', 'articles.id desc'])
-    if !( scoped_methods && scoped_methods.last &&
-        scoped_methods.last[:find] &&
-        scoped_methods.last[:find][:joins] &&
-        scoped_methods.last[:find][:joins].index('profiles') )
-      result = result.includes(:profile)
-    end
-
     pagination ? result.paginate({:page => 1, :per_page => limit}) : result
   end
@@ -16,11 +16,11 @@ class CommunitiesBlock &lt; ProfileListBlock
     owner = self.owner
     case owner
     when Profile
-      lambda do
+      lambda do |context|
         link_to s_('communities|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities'
       end
     when Environment
-      lambda do
+      lambda do |context|
         link_to s_('communities|View all'), :controller => 'search', :action => 'communities'
       end
     else
+require 'noosfero/multi_tenancy'
+
 class Domain < ActiveRecord::Base
   attr_accessible :name
@@ -9,7 +9,7 @@ class LoginBlock &lt; Block
   end
   def content(args={})
-    lambda do
+    lambda do |context|
       render :file => 'blocks/login_block'
     end
   end
@@ -17,7 +17,7 @@ class PeopleBlock &lt; ProfileListBlock
   end
   def footer
-    lambda do
+    lambda do |context|
       link_to _('View all'), :controller => 'search', :action => 'people'
     end
   end
@@ -44,7 +44,7 @@ class ProfileListBlock &lt; Block
     profiles = self.profile_list
     title = self.view_title
     nl = "\n"
-    lambda do
+    lambda do |context|
       count=0
       list = profiles.map {|item|
                count+=1
@@ -2,7 +2,7 @@
 <%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
-<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do |f| %>
+<%= labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do |f| %>
 <%= hidden_field_tag :invitation_code, @invitation_code %>
@@ -7,7 +7,7 @@
 <%= @message %>
-<% labelled_form_for :user, @user, :url => login_url do |f| %>
+<%= labelled_form_for :user, @user, :url => login_url do |f| %>
      <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>
@@ -9,7 +9,7 @@
   @user ||= User.new
 %>
-    <% labelled_form_for :user, @user, :url => login_url do |f| %>
+    <%= labelled_form_for :user, @user, :url => login_url do |f| %>
       <%= f.text_field :login, :onchange => 'this.value = convToValidLogin( this.value )' %>
@@ -3,7 +3,7 @@
 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
 'add-and-join', 'report-abuse', 'catalog', 'manage-products',
-'jquery-ui-timepicker-addon', :cache => 'cache-general' %>
+'jquery-ui-timepicker-addon', 'application.js', :cache => 'cache-general' %>
 <% language = FastGettext.locale %>
 <% %w{messages methods}.each do |type| %>
@@ -9,14 +9,14 @@
     <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
     <%= noosfero_javascript %>
     <%= stylesheet_link_tag *noosfero_stylesheets, :cache => 'cache' %>
-    <%= stylesheet_link_tag template_stylesheet_path %>
-    <%= stylesheet_link_tag icon_theme_stylesheet_path %>
-    <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
+    <%= stylesheet_link_tag *template_stylesheet_path %>
+    <%= stylesheet_link_tag *icon_theme_stylesheet_path %>
+    <%= stylesheet_link_tag *jquery_ui_theme_stylesheet_path %>
     <%
       plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
     %>
-    <%= stylesheet_link_tag(plugins_stylesheets, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_stylesheets.to_s)) unless plugins_stylesheets.empty? %>
-    <%= stylesheet_link_tag theme_stylesheet_path %>
+    <%= stylesheet_link_tag(*plugins_stylesheets, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_stylesheets.to_s)) unless plugins_stylesheets.empty? %>
+    <%= stylesheet_link_tag *theme_stylesheet_path %>
     <%# Add custom tags/styles/etc via content_for %>
     <%= yield :head %>
@@ -24,7 +24,7 @@
     <%
       plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten
     %>
-    <%= javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty? %>
+    <%= javascript_include_tag(*plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty? %>
     <%=
       @plugins.dispatch(:head_ending).collect do |content|
         content.respond_to?(:call) ? content.call : content
@@ -74,7 +74,7 @@ module Noosfero
     config.active_record.whitelist_attributes = true
     # Enable the asset pipeline
-    config.assets.enabled = true
+    config.assets.enabled = false
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
 require 'noosfero'
+require 'environment_domain_constraint'
 Noosfero::Application.routes.draw do
   # The priority is based upon order of creation: first created -> highest priority.
-  
   # Sample of regular route:
   # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
   # Keep in mind you can assign values other than :controller and :action
@@ -16,47 +16,45 @@ Noosfero::Application.routes.draw do
   ######################################################
   match 'test/:controller(/:action(/:id))'  , :controller => /.*test.*/
- 
+
   # -- just remember to delete public/index.html.
   # You can have the root of your site routed by hooking up ''
-  root :to => 'home#index'
+  root :to => 'home#index', :constraints => EnvironmentDomainConstraint.new
-  # FIXME adapt the rest of the routes below
-end
-__END__
-  map.connect '', :controller => "home", :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
-  map.home 'site/:action', :controller => 'home'
+  match 'site(/:action)', :controller => 'home'
-  map.connect 'images/*stuff', :controller => 'not_found', :action => 'nothing'
-  map.connect 'stylesheets/*stuff', :controller => 'not_found', :action => 'nothing'
-  map.connect 'designs/*stuff', :controller => 'not_found', :action => 'nothing'
-  map.connect 'articles/*stuff', :controller => 'not_found', :action => 'nothing'
-  map.connect 'javascripts/*stuff', :controller => 'not_found', :action => 'nothing'
-  map.connect 'thumbnails/*stuff', :controller => 'not_found', :action => 'nothing'
-  map.connect 'user_themes/*stuff', :controller => 'not_found', :action => 'nothing'
+  match 'images/*stuff' => 'not_found#nothing'
+  match 'stylesheets/*stuff' => 'not_found#nothing'
+  match 'designs/*stuff' => 'not_found#nothing'
+  match 'articles/*stuff' => 'not_found#nothing'
+  match 'javascripts/*stuff' => 'not_found#nothing'
+  match 'thumbnails/*stuff' => 'not_found#nothing'
+  match 'user_themes/*stuff' => 'not_found#nothing'
   # online documentation
-  map.doc         'doc', :controller => 'doc', :action => 'index'
-  map.doc_section 'doc/:section', :controller => 'doc', :action => 'section'
-  map.doc_topic   'doc/:section/:topic', :controller => 'doc', :action => 'topic'
-  
+  match 'doc' => 'doc#index', :as => :doc
+  match 'doc/:section' => 'doc#section', :as => :doc_section
+  match 'doc/:section/:topic' => 'doc#topic', :as => :doc_topic
+
   # user account controller
-  map.connect 'account/new_password/:code', :controller => 'account', :action => 'new_password'
-  map.connect 'account/:action', :controller => 'account'
+  match 'account/new_password/:code' => 'account#new_password', :controller => 'account', :action => 'new_password'
+  match 'account/:action', :controller => 'account'
   # enterprise registration
-  map.connect 'enterprise_registration/:action', :controller => 'enterprise_registration'
+  match 'enterprise_registration/:action', :controller => 'enterprise_registration'
   # tags
-  map.tag 'tag', :controller => 'search', :action => 'tags'
-  map.tag 'tag/:tag', :controller => 'search', :action => 'tag', :tag => /.*/
-  
+  match 'tag', :controller => 'search', :action => 'tags'
+  match 'tag/:tag', :controller => 'search', :action => 'tag', :tag => /.*/
+
   # categories index
-  map.category 'cat/*category_path', :controller => 'search', :action => 'category_index'
-  map.assets 'assets/:asset/*category_path', :controller => 'search', :action => 'assets'
+  match 'cat/*category_path' => 'search#category_index', :as => :category
+  match 'assets/:asset(/*category_path)' => 'search#assets', :as => :assets
   # search
-  map.connect 'search/:action/*category_path', :controller => 'search'
- 
+  match 'search/:action(/*category_path)', :controller => 'search'
+
+end # FIXME remove this line and the following and finish rewriting the routes
+__END__
   # events
   map.events 'profile/:profile/events_by_day', :controller => 'events', :action => 'events_by_day', :profile => /#{Noosfero.identifier_format}/
   map.events 'profile/:profile/events/:year/:month/:day', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :day => /\d*/, :profile => /#{Noosfero.identifier_format}/
@@ -0,0 +1,5 @@
+class EnvironmentDomainConstraint
+  def matches?(request)
+    !Domain.hosting_profile_at(request.host)
+  end
+end
	@@ -826,8 +826,8 @@ module ApplicationHelper		@@ -826,8 +826,8 @@ module ApplicationHelper
826	end	826	end
827		827
828	def labelled_form_for(name, object = nil, options = {}, &proc)	828	def labelled_form_for(name, object = nil, options = {}, &proc)
829	- object \|\|= instance_variable_get("@#{name}")
830	- form_for(name, object, { :builder => NoosferoFormBuilder }.merge(options), &proc)	829	+ # FIXME remove the =object= argument and adapt the calling code
		830	+ form_for(name, { :builder => NoosferoFormBuilder }.merge(options), &proc)
831	end	831	end
832		832
833	def optional_field(profile, name, field_html = nil, only_required = false, &block)	833	def optional_field(profile, name, field_html = nil, only_required = false, &block)
	@@ -1409,4 +1409,28 @@ module ApplicationHelper		@@ -1409,4 +1409,28 @@ module ApplicationHelper
1409	options[:class] = "comment-footer comment-footer-link comment-footer-hide"	1409	options[:class] = "comment-footer comment-footer-link comment-footer-hide"
1410	expirable_content_reference content, action, text, url, options	1410	expirable_content_reference content, action, text, url, options
1411	end	1411	end
		1412	+
		1413	+ def error_messages_for(*args)
		1414	+ options = args.pop if args.last.is_a?(Hash)
		1415	+ errors = []
		1416	+ args.each do \|name\|
		1417	+ object = instance_variable_get("@#{name}")
		1418	+ object.errors.full_messages.each do \|msg\|
		1419	+ errors << msg
		1420	+ end
		1421	+ end
		1422	+ return '' if errors.empty?
		1423	+
		1424	+ content_tag(:div, :class => 'errorExplanation', :id => 'errorExplanation') do
		1425	+ content_tag(:h2, _('Errors while saving')) +
		1426	+ content_tag(:ul) do
		1427	+ errors.map { \|err\| content_tag(:li, err) }
		1428	+ end
		1429	+ end
		1430	+ end
		1431	+
		1432	+ # FIXME
		1433	+ def observe_field(*args)
		1434	+ ''
		1435	+ end
1412	end	1436	end
	@@ -267,7 +267,7 @@ module CountriesHelper		@@ -267,7 +267,7 @@ module CountriesHelper
267	end	267	end
268		268
269	def countries	269	def countries
270	- self.class.countries.map {\|item\| [gettext(item[0]), item[1] ]}.sort_by { \|entry\| entry.first.transliterate }	270	+ CountriesHelper.countries.map {\|item\| [gettext(item[0]), item[1] ]}.sort_by { \|entry\| entry.first.transliterate }
271	end	271	end
272		272
273	def lookup(code)	273	def lookup(code)
	@@ -219,13 +219,6 @@ class Article < ActiveRecord::Base		@@ -219,13 +219,6 @@ class Article < ActiveRecord::Base
219	limit(limit).	219	limit(limit).
220	order(['articles.published_at desc', 'articles.id desc'])	220	order(['articles.published_at desc', 'articles.id desc'])
221		221
222	- if !( scoped_methods && scoped_methods.last &&
223	- scoped_methods.last[:find] &&
224	- scoped_methods.last[:find][:joins] &&
225	- scoped_methods.last[:find][:joins].index('profiles') )
226	- result = result.includes(:profile)
227	- end
228	-
229	pagination ? result.paginate({:page => 1, :per_page => limit}) : result	222	pagination ? result.paginate({:page => 1, :per_page => limit}) : result
230	end	223	end
231		224
	@@ -16,11 +16,11 @@ class CommunitiesBlock < ProfileListBlock		@@ -16,11 +16,11 @@ class CommunitiesBlock < ProfileListBlock
16	owner = self.owner	16	owner = self.owner
17	case owner	17	case owner
18	when Profile	18	when Profile
19	- lambda do	19	+ lambda do \|context\|
20	link_to s_('communities\|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities'	20	link_to s_('communities\|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities'
21	end	21	end
22	when Environment	22	when Environment
23	- lambda do	23	+ lambda do \|context\|
24	link_to s_('communities\|View all'), :controller => 'search', :action => 'communities'	24	link_to s_('communities\|View all'), :controller => 'search', :action => 'communities'
25	end	25	end
26	else	26	else
		1	+require 'noosfero/multi_tenancy'
		2	+
1	class Domain < ActiveRecord::Base	3	class Domain < ActiveRecord::Base
2		4
3	attr_accessible :name	5	attr_accessible :name
	@@ -9,7 +9,7 @@ class LoginBlock < Block		@@ -9,7 +9,7 @@ class LoginBlock < Block
9	end	9	end
10		10
11	def content(args={})	11	def content(args={})
12	- lambda do	12	+ lambda do \|context\|
13	render :file => 'blocks/login_block'	13	render :file => 'blocks/login_block'
14	end	14	end
15	end	15	end
	@@ -17,7 +17,7 @@ class PeopleBlock < ProfileListBlock		@@ -17,7 +17,7 @@ class PeopleBlock < ProfileListBlock
17	end	17	end
18		18
19	def footer	19	def footer
20	- lambda do	20	+ lambda do \|context\|
21	link_to _('View all'), :controller => 'search', :action => 'people'	21	link_to _('View all'), :controller => 'search', :action => 'people'
22	end	22	end
23	end	23	end
	@@ -44,7 +44,7 @@ class ProfileListBlock < Block		@@ -44,7 +44,7 @@ class ProfileListBlock < Block
44	profiles = self.profile_list	44	profiles = self.profile_list
45	title = self.view_title	45	title = self.view_title
46	nl = "\n"	46	nl = "\n"
47	- lambda do	47	+ lambda do \|context\|
48	count=0	48	count=0
49	list = profiles.map {\|item\|	49	list = profiles.map {\|item\|
50	count+=1	50	count+=1
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2		2
3	<%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>	3	<%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
4		4
5	-<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do \|f\| %>	5	+<%= labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do \|f\| %>
6		6
7	<%= hidden_field_tag :invitation_code, @invitation_code %>	7	<%= hidden_field_tag :invitation_code, @invitation_code %>
8		8
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7		7
8	<%= @message %>	8	<%= @message %>
9		9
10	-<% labelled_form_for :user, @user, :url => login_url do \|f\| %>	10	+<%= labelled_form_for :user, @user, :url => login_url do \|f\| %>
11		11
12	<%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>	12	<%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>
13		13