Adds user icon for null avatar on user menu

That commit makes gravatar helper to work on this context.

Adds user icon for null avatar on user menu
That commit makes gravatar helper to work on this context.
Aurélio A. Heckert
1 parent 817df70a
Showing 3 changed files with 15 additions and 13 deletions Show diff stats
app/controllers/public/account_controller.rb
app/helpers/application_helper.rb
app/models/user.rb
@@ -262,7 +262,7 @@ class AccountController &lt; ApplicationController
   def user_data
     user_data =
       if logged_in?
-        current_user.data_hash
+        current_user.data_hash self
       else
         { }
       end
@@ -356,7 +356,8 @@ module ApplicationHelper
   end
   def theme_path
-    if session[:theme]
+    if ( respond_to?(:session) && session[:theme] ) ||
+       ( @controller && @controller.session[:theme] )
       '/user_themes/' + current_theme
     else
       '/designs/themes/' + current_theme
@@ -366,7 +367,8 @@ module ApplicationHelper
   def current_theme
     @current_theme ||=
       begin
-        if (session[:theme])
+        if ( respond_to?(:session) && session[:theme] ) ||
+           ( @controller && @controller.session[:theme] )
           session[:theme]
         else
           # utility for developers: set the theme to 'random' in development mode and
@@ -375,7 +377,7 @@ module ApplicationHelper
           if ENV['RAILS_ENV'] == 'development' && environment.theme == 'random'
             @random_theme ||= Dir.glob('public/designs/themes/*').map { |f| File.basename(f) }.rand
             @random_theme
-          elsif ENV['RAILS_ENV'] == 'development' && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
+          elsif ENV['RAILS_ENV'] == 'development' && respond_to?(:params) && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
             params[:theme]
           else
             if profile && !profile.theme.nil?
@@ -600,15 +602,10 @@ module ApplicationHelper
   def str_gravatar_url_for(email, options = {})
     default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
-    url = 'http://www.gravatar.com/avatar.php?gravatar_id=' +
-           Digest::MD5.hexdigest(email.to_s)
-    {
+    "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.to_s)}?" + {
       :only_path => false,
       :d => default
-    }.merge(options).each { |k,v|
-      url += ( '&%s=%s' % [ k,v ] )
-    }
-    url
+    }.merge(options).map{|k,v| '%s=%s' % [ k,v ] }.join('&')
   end
   def gravatar_profile_url(email)
@@ -275,7 +275,10 @@ class User &lt; ActiveRecord::Base
     end
   end
-  def data_hash
+  include ApplicationHelper
+
+  def data_hash(controller=nil)
+    @controller ||= controller
     friends_list = {}
     enterprises = person.enterprises.map { |e| { 'name' => e.short_name, 'identifier' => e.identifier } }
     self.person.friends.online.map do |person|
@@ -286,9 +289,11 @@ class User &lt; ActiveRecord::Base
         'status' => person.user.chat_status,
       }
     end
+    avatar = self.person.profile_custom_icon
+    avatar = str_gravatar_url_for(self.email, :size=>20) if avatar.blank?
     {
       'login' => self.login,
-      'avatar' => person.profile_custom_icon,
+      'avatar' => avatar,
       'is_admin' => self.person.is_admin?,
       'since_month' => self.person.created_at.month,
       'since_year' => self.person.created_at.year,
	@@ -262,7 +262,7 @@ class AccountController < ApplicationController		@@ -262,7 +262,7 @@ class AccountController < ApplicationController
262	def user_data	262	def user_data
263	user_data =	263	user_data =
264	if logged_in?	264	if logged_in?
265	- current_user.data_hash	265	+ current_user.data_hash self
266	else	266	else
267	{ }	267	{ }
268	end	268	end