Download as
Browse Code »

Commit 1910a1d6e1e66286692906c0e909b7aba722eb19

Authored by Braulio Bhavamitra
1 parent 53ccf362
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Send profile data on user data

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