Merge branch 'production' of gitlab.com:participa/noosfero into production

Ábner Silva de Oliveira
2 parents 789caf25 f7311a2f
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb
plugins/proposals_discussion
@@ -7,7 +7,7 @@
 <script>
   window.addEventListener("message", function(ev) {
     if (ev.data.message === "requestOauthClientPluginResult") {
-      ev.source.postMessage({ message: "oauthClientPluginResult", logged_in: <%= logged_in? %>, private_token: '<%= private_token %>', user: <%= current_user.to_json %> }, "*");
+      ev.source.postMessage({ message: "oauthClientPluginResult", logged_in: <%= logged_in? %>, private_token: '<%= private_token %>', user: <%= (logged_in? ? {:login => current_user.login, :person => {:identifier => current_user.person.identifier, :name => current_user.person.name}} : {}).to_json %> }, "*");
     }
   });
 </script>
-Subproject commit e6cd995bbde179a2b941d80ae5c1a05a4bf7ffa5
+Subproject commit bba03dc8febb8d44564339bc08fb71eb65349d8a
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	<script>	7	<script>
8	window.addEventListener("message", function(ev) {	8	window.addEventListener("message", function(ev) {
9	if (ev.data.message === "requestOauthClientPluginResult") {	9	if (ev.data.message === "requestOauthClientPluginResult") {
10	- ev.source.postMessage({ message: "oauthClientPluginResult", logged_in: <%= logged_in? %>, private_token: '<%= private_token %>', user: <%= current_user.to_json %> }, "*");	10	+ ev.source.postMessage({ message: "oauthClientPluginResult", logged_in: <%= logged_in? %>, private_token: '<%= private_token %>', user: <%= (logged_in? ? {:login => current_user.login, :person => {:identifier => current_user.person.identifier, :name => current_user.person.name}} : {}).to_json %> }, "*");
11	}	11	}
12	});	12	});
13	</script>	13	</script>