ActionItem1165: sharing user menu

Antonio Terceiro
1 parent f32d1d5b
Showing 6 changed files with 18 additions and 12 deletions Show diff stats
app/controllers/public/account_controller.rb
app/views/account/user_menu.rjs
app/views/layouts/application.rhtml
db/schema.rb
test/integration/categories_menu_test.rb
test/integration/user_registers_at_the_application_test.rb
@@ -227,6 +227,10 @@ class AccountController &lt; ApplicationController
     render :partial => 'identifier_status'
   end
+  def user_menu
+    # nothing
+  end
+
   protected
   def redirect?
@@ -0,0 +1 @@
+page.replace_html 'user_box', :file => 'shared/user_menu'
@@ -102,7 +102,12 @@
         </div>
         <div id="user_box">
-          <%= render :file => 'shared/user_menu' %>
+          <%# WARNING this is a horrible hack while we don't have an actual SSO system. %>
+          <% if environment.enable_ssl && request.host != environment.default_hostname %>
+            <%= content_tag 'script', '', :type => 'text/javascript', :src => environment.top_url(true) + '/account/user_menu' %>
+          <% else %>
+            <%= render :file => 'shared/user_menu' %>
+          <% end %>
         </div><!-- id='user_box' -->
         <a href="#" id="btShowHelp" class="icon-help32on help-on icon-help-on"
@@ -89,8 +89,8 @@ ActiveRecord::Schema.define(:version =&gt; 69) do
     t.boolean "virtual",     :default => false
   end
-  add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
   add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"
+  add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
   create_table "blocks", :force => true do |t|
     t.string   "title"
@@ -284,6 +284,10 @@ ActiveRecord::Schema.define(:version =&gt; 69) do
     t.integer "environment_id"
   end
+  create_table "schema_info", :id => false, :force => true do |t|
+    t.integer "version"
+  end
+
   create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
@@ -291,8 +295,8 @@ ActiveRecord::Schema.define(:version =&gt; 69) do
     t.datetime "created_at"
   end
-  add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
   add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
   create_table "tags", :force => true do |t|
     t.string  "name"
@@ -35,7 +35,7 @@ class CategoriesMenuTest &lt; ActionController::IntegrationTest
   end
   should 'cache the categories menu' do
-    ActionView::Base.any_instance.expects(:cache).with(Environment.default.name + "_categories_menu")
+    ActionView::Base.any_instance.expects(:cache).with(Environment.default.id.to_s + "_categories_menu")
     get '/'
   end
@@ -10,10 +10,6 @@ class UserRegistersAtTheApplicationTest &lt; ActionController::IntegrationTest
     get '/account/signup'
-    # going SSL
-    assert_response :redirect
-    follow_redirect!
-
     assert_response :success
     post '/account/signup', :user => { :login => 'mylogin', :password => 'mypassword', :password_confirmation => 'mypassword', :email => 'mylogin@example.com' }
@@ -36,10 +32,6 @@ class UserRegistersAtTheApplicationTest &lt; ActionController::IntegrationTest
     get '/account/signup'
-    # going SSL
-    assert_response :redirect
-    follow_redirect!
-
     assert_response :success
     post '/account/signup', :user => { :login => 'ze', :password => 'mypassword', :password_confirmation => 'mypassword', :email => 'mylogin@example.com' }
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+page.replace_html 'user_box', :file => 'shared/user_menu'
	@@ -35,7 +35,7 @@ class CategoriesMenuTest < ActionController::IntegrationTest		@@ -35,7 +35,7 @@ class CategoriesMenuTest < ActionController::IntegrationTest
35	end	35	end
36		36
37	should 'cache the categories menu' do	37	should 'cache the categories menu' do
38	- ActionView::Base.any_instance.expects(:cache).with(Environment.default.name + "_categories_menu")	38	+ ActionView::Base.any_instance.expects(:cache).with(Environment.default.id.to_s + "_categories_menu")
39	get '/'	39	get '/'
40	end	40	end
41		41