Download as
Browse Code »

Commit 82d3ed8efd444c036791dcc219dd4d3146d7a00e

Authored by Braulio Bhavamitra
2 parents 11bca1cb 1910a1d6
Exists in master and in 21 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_pagination, api_private_token, api_tasks, article_hit_count, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings

Merge branch 'ai3150' into 'master' 

Set current profile and add name and email to user_data

http://noosfero.org/Development/ActionItem3150

See merge request !228
Showing 2 changed files with 3 additions and 0 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @82d3ed8
... ... @@ -320,6 +320,8 @@ class User < ActiveRecord::Base
320 320  
321 321 {
322 322 'login' => self.login,
  323 + 'name' => self.person.name,
  324 + 'email' => self.email,
323 325 'avatar' => self.person.profile_custom_icon(gravatar_default),
324 326 'is_admin' => self.person.is_admin?,
325 327 'since_month' => self.person.created_at.month,
... ...
app/views/layouts/application-ng.html.erb
  Diff comments   View file @82d3ed8
... ... @@ -27,6 +27,7 @@
27 27  
28 28 <script type="text/javascript">
29 29 DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
  30 + noosfero.profile = <%= (@profile.identifier if @profile).to_json %>
30 31 </script>
31 32  
32 33 </head>
... ...