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

Evandro Junior
2 parents 4c937832 1223902d
Showing 9 changed files with 26 additions and 6 deletions Show diff stats
app/views/cms/edit.html.erb
lib/noosfero/api/entities.rb
lib/noosfero/api/v1/articles.rb
lib/noosfero/api/v1/users.rb
plugins/proposals_discussion
public/designs/themes/participa-theme
public/javascripts/application.js
public/proposal-app
test/unit/api/users_test.rb
 <%= error_messages_for 'article' %>
  
-<% show_media_panel = environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
+<% show_media_panel = environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage, ProposalsDiscussionPlugin::Topic, ProposalsDiscussionPlugin::Discussion].any?{|klass| @article.kind_of?(klass)} %>
  
 <div class='<%= (show_media_panel ? 'with_media_panel' : 'no_media_panel') %>'>
 <%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
@@ -64,6 +64,8 @@ module Noosfero
         expose :profile, :using => Profile
         expose :categories, :using => Category
         expose :image, :using => Image
+        expose :votes_for
+        expose :votes_against
       end
  
       class Article < ArticleBase
@@ -40,8 +40,15 @@ module Noosfero
  
           get ':id/children' do
             article = find_article(environment.articles, params[:id])
+
+            votes_order = params.delete(:order) if params[:order]=='votes_score'
             articles = select_filtered_collection_of(article, 'children', params)
             articles = articles.display_filter(current_person, nil)
+
+            if votes_order
+              articles = articles.joins('left join votes on articles.id=votes.voteable_id').group('articles.id').reorder('sum(coalesce(votes.vote, 0)) DESC')
+            end
+
             present articles, :with => Entities::Article, :fields => params[:fields]
           end
  
@@ -24,11 +24,15 @@ module Noosfero
  
             present user, :with => Entities::User
           end
-  
+
+          get "/me" do
+            present current_user, :with => Entities::User
+          end
+
           get ":id" do
             present environment.users.find_by_id(params[:id]), :with => Entities::User
           end
-  
+
           get ":id/permissions" do
             user = environment.users.find(params[:id])
             output = {}
-Subproject commit 3a32ff13a05df2d443410642172c2a4df1585ca1
+Subproject commit f3f2b7f6fd7a2aeb927f5f9cce9a7d3c5e655a3c
-Subproject commit 4716af097fe208efdf75a72997328ed23c00f4f6
+Subproject commit 105c0714d83699cd2eb1822514ba5a01c1d870b0
@@ -30,6 +30,7 @@
 *= require slick.js
 *= require select-or-die/_src/selectordie.js
 *= require block-store.js
+*= require jquery.typewatch.js
 */
  
 // scope for noosfero stuff
-Subproject commit 318967386e6f99b0debb2e3a9076bae3502e65fc
+Subproject commit 1ce4dbee53562a2ef69a1208f6565b46199e551b
@@ -40,4 +40,10 @@ class UsersTest &lt; ActiveSupport::TestCase
     assert_includes json["user"]["permissions"], community.identifier
   end
  
+  should 'get logged user' do
+    get "/api/v1/users/me?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal user.id, json['user']['id']
+  end
+
 end
1	1	<%= error_messages_for 'article' %>
2	2
3		-<% show_media_panel = environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{\|klass\| @article.kind_of?(klass)} %>
	3	+<% show_media_panel = environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage, ProposalsDiscussionPlugin::Topic, ProposalsDiscussionPlugin::Discussion].any?{\|klass\| @article.kind_of?(klass)} %>
4	4
5	5	<div class='<%= (show_media_panel ? 'with_media_panel' : 'no_media_panel') %>'>
6	6	<%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do \|f\| %>
...	...
...	...	@@ -64,6 +64,8 @@ module Noosfero
64	64	expose :profile, :using => Profile
65	65	expose :categories, :using => Category
66	66	expose :image, :using => Image
	67	+ expose :votes_for
	68	+ expose :votes_against
67	69	end
68	70
69	71	class Article < ArticleBase
...	...
...	...	@@ -40,8 +40,15 @@ module Noosfero
40	40
41	41	get ':id/children' do
42	42	article = find_article(environment.articles, params[:id])
	43	+
	44	+ votes_order = params.delete(:order) if params[:order]=='votes_score'
43	45	articles = select_filtered_collection_of(article, 'children', params)
44	46	articles = articles.display_filter(current_person, nil)
	47	+
	48	+ if votes_order
	49	+ articles = articles.joins('left join votes on articles.id=votes.voteable_id').group('articles.id').reorder('sum(coalesce(votes.vote, 0)) DESC')
	50	+ end
	51	+
45	52	present articles, :with => Entities::Article, :fields => params[:fields]
46	53	end
47	54
...	...
...	...	@@ -24,11 +24,15 @@ module Noosfero
24	24
25	25	present user, :with => Entities::User
26	26	end
27		-
	27	+
	28	+ get "/me" do
	29	+ present current_user, :with => Entities::User
	30	+ end
	31	+
28	32	get ":id" do
29	33	present environment.users.find_by_id(params[:id]), :with => Entities::User
30	34	end
31		-
	35	+
32	36	get ":id/permissions" do
33	37	user = environment.users.find(params[:id])
34	38	output = {}
...	...
1		-Subproject commit 3a32ff13a05df2d443410642172c2a4df1585ca1
	1	+Subproject commit f3f2b7f6fd7a2aeb927f5f9cce9a7d3c5e655a3c
...	...
1		-Subproject commit 4716af097fe208efdf75a72997328ed23c00f4f6
	1	+Subproject commit 105c0714d83699cd2eb1822514ba5a01c1d870b0
...	...
...	...	@@ -30,6 +30,7 @@
30	30	*= require slick.js
31	31	*= require select-or-die/_src/selectordie.js
32	32	*= require block-store.js
	33	+*= require jquery.typewatch.js
33	34	*/
34	35
35	36	// scope for noosfero stuff
...	...
1		-Subproject commit 318967386e6f99b0debb2e3a9076bae3502e65fc
	1	+Subproject commit 1ce4dbee53562a2ef69a1208f6565b46199e551b
...	...
...	...	@@ -40,4 +40,10 @@ class UsersTest < ActiveSupport::TestCase
40	40	assert_includes json["user"]["permissions"], community.identifier
41	41	end
42	42
	43	+ should 'get logged user' do
	44	+ get "/api/v1/users/me?#{params.to_query}"
	45	+ json = JSON.parse(last_response.body)
	46	+ assert_equal user.id, json['user']['id']
	47	+ end
	48	+
43	49	end
...	...