[Git][noosfero/noosfero][master] 2 commits: Send profile data on user data

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
1910a1d6 by Braulio Bhavamitra at 2015-06-17T13:24:20Z
Send profile data on user data

- - - - -
82d3ed8e by Bráulio Bhavamitra at 2015-06-17T16:28:26Z
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

- - - - -


2 changed files:

- app/models/user.rb
- app/views/layouts/application-ng.html.erb


Changes:

=====================================
app/models/user.rb
=====================================
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -320,6 +320,8 @@ class User < ActiveRecord::Base
 
     {
       'login' => self.login,
+      'name' => self.person.name,
+      'email' => self.email,
       'avatar' => self.person.profile_custom_icon(gravatar_default),
       'is_admin' => self.person.is_admin?,
       'since_month' => self.person.created_at.month,


=====================================
app/views/layouts/application-ng.html.erb
=====================================
--- a/app/views/layouts/application-ng.html.erb
+++ b/app/views/layouts/application-ng.html.erb
@@ -27,6 +27,7 @@
 
     <script type="text/javascript">
       DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
+      noosfero.profile = <%= (@profile.identifier if @profile).to_json %>
     </script>
 
   </head>



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/11bca1cb4db65dadb8c04b87d23b6b0ab40e17a5...82d3ed8efd444c036791dcc219dd4d3146d7a00e
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150617/c299f201/attachment.html>