Temp/0.23 stable

config/i18n-tasks.yml

@@ -20,9 +20,9 @@ data:
   # `i18n-tasks normalize -p` will force move the keys according to these rules
   write:
     <% Dir.glob("decidim-*").each do |path| -%>
-      <%= "- ['#{path.sub('-', '.')}.*', '#{path}/config/locales/%{locale}.yml']" %>
+    <%= "- ['#{path.sub('-', '.')}.*', '#{path}/config/locales/%{locale}.yml']" %>
     <% end -%>
-      - 'decidim-core/config/locales/%{locale}.yml'
+    - 'decidim-core/config/locales/%{locale}.yml'
 
   ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
   # router: convervative_router
@@ -45,20 +45,20 @@ search:
   ## Paths or `File.find` patterns to search in:
   paths:
     <% Dir.glob("decidim-*").each do |path| -%>
-      <%= "- #{path}/app\n" %>
-      <%= "- #{path}/lib\n" %>
+    <%= "- #{path}/app\n" %>
+    <%= "- #{path}/lib\n" %>
     <% end -%>
 
   # Root directories for relative keys resolution.
   relative_roots:
     <% Dir.glob("decidim-*").each do |path| -%>
-      <%= "- #{path}/app/controllers\n" %>
-      <%= "- #{path}/app/helpers\n" %>
-      <%= "- #{path}/app/mailers\n" %>
-      <%= "- #{path}/app/presenters\n" %>
-      <%= "- #{path}/app/services\n" %>
-      <%= "- #{path}/app/views\n" %>
-      <%= "- #{path}/app/cells\n" %>
+    <%= "- #{path}/app/controllers\n" %>
+    <%= "- #{path}/app/helpers\n" %>
+    <%= "- #{path}/app/mailers\n" %>
+    <%= "- #{path}/app/presenters\n" %>
+    <%= "- #{path}/app/services\n" %>
+    <%= "- #{path}/app/views\n" %>
+    <%= "- #{path}/app/cells\n" %>
     <% end -%>
 
   ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:

decidim-admin/app/helpers/decidim/admin/settings_helper.rb

@@ -13,7 +13,8 @@ module SettingsHelper
         string: :text_field,
         text: :text_area,
         scope: :scope_field,
-        enum: :collection_radio_buttons
+        enum: :collection_radio_buttons,
+        time: :datetime_field
       }.freeze
 
       # Public: Renders a form field that matches a settings attribute's

decidim-admin/spec/helpers/settings_helper_spec.rb

@@ -130,6 +130,15 @@ def render_input
           render_input
         end
       end
+
+      describe "times" do
+        let(:type) { :time }
+
+        it "is supported" do
+          expect(form).to receive(:datetime_field).with(:test, options)
+          render_input
+        end
+      end
     end
   end
 end

decidim-assemblies/app/controllers/concerns/decidim/assemblies/admin/filterable.rb

@@ -23,6 +23,26 @@ def base_query
           def extra_filters
             [:parent_id_eq]
           end
+
+          def filters
+            [:private_space_eq, :published_at_null, :decidim_assemblies_type_id_eq]
+          end
+
+          def filters_with_values
+            {
+              private_space_eq: [true, false],
+              published_at_null: [true, false],
+              decidim_assemblies_type_id_eq: AssembliesType.where(organization: current_organization).pluck(:id)
+            }
+          end
+
+          def dynamically_translated_filters
+            [:decidim_assemblies_type_id_eq]
+          end
+
+          def translated_decidim_assemblies_type_id_eq(id)
+            translated_attribute(Decidim::AssembliesType.find_by(id: id).title[I18n.locale.to_s])
+          end
         end
       end
     end

decidim-assemblies/config/locales/en.yml

@@ -182,6 +182,9 @@ en:
         update:
           error: There was a problem updating an admin for this assembly.
           success: Admin updated successfully for this assembly.
+      filters:
+        decidim_assemblies_type_id_eq:
+          label: Assembly type
       menu:
         assemblies: Assemblies
         assemblies_settings: Settings

decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb

@@ -81,6 +81,37 @@
     describe "listing parent assemblies" do
       it_behaves_like "filtering collection by published/unpublished"
       it_behaves_like "filtering collection by private/public"
+
+      context "when filtering by assemblies type" do
+        include_context "with filterable context"
+
+        let!(:assemblies_type_1) { create(:assemblies_type) }
+        let!(:assemblies_type_2) { create(:assemblies_type) }
+
+        Decidim::AssembliesType.all.each do |assemblies_type|
+          i18n_assemblies_type = assemblies_type.name[I18n.locale.to_s]
+
+          context "filtering collection by assemblies_type: #{i18n_assemblies_type}" do
+            let!(:assembly_1) { create(:assembly, organization: organization, assemblies_type: assemblies_type_1) }
+            let!(:assembly_2) { create(:assembly, organization: organization, assemblies_type: assemblies_type_2) }
+
+            it_behaves_like "a filtered collection", options: "Assembly type", filter: i18n_assemblies_type do
+              let(:in_filter) { translated(assembly_with_type(type).title) }
+              let(:not_in_filter) { translated(assembly_without_type(type).title) }
+            end
+          end
+        end
+
+        it_behaves_like "paginating a collection"
+
+        def assembly_with_type(type)
+          Decidim::Assembly.find_by(decidim_assemblies_type_id: type)
+        end
+
+        def assembly_without_type(type)
+          Decidim::Assembly.where.not(decidim_assemblies_type_id: type).sample
+        end
+      end
     end
   end
 

decidim-budgets/lib/decidim/budgets/component.rb

@@ -34,6 +34,7 @@
     resource.card = "decidim/budgets/project"
     resource.actions = %(vote)
     resource.searchable = true
+    resource.parent_resource = "budget" # method to access parent resource
   end
 
   component.register_stat :budgets_count, primary: true, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components|

decidim-comments/app/commands/decidim/comments/vote_comment.rb

@@ -28,22 +28,39 @@ def call
           if vote
             vote.destroy!
           else
-            @comment.up_votes.create!(author: @author)
+            @vote = @comment.up_votes.create!(author: @author)
           end
         elsif @weight == -1
           vote = @comment.down_votes.find_by(author: @author)
           if vote
             vote.destroy!
           else
-            @comment.down_votes.create!(author: @author)
+            @vote = @comment.down_votes.create!(author: @author)
           end
         else
           return broadcast(:invalid)
         end
+
+        notify_comment_author if @vote
         broadcast(:ok, @comment)
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
         broadcast(:invalid)
       end
+
+      def notify_comment_author
+        Decidim::EventsManager.publish(
+          event: "decidim.events.comments.comment_voted",
+          event_class: Decidim::Comments::CommentVotedEvent,
+          resource: @comment.commentable,
+          affected_users: [@author],
+          followers: [@comment.author],
+          extra: {
+            comment_id: @comment.id,
+            author_id: @author.id,
+            weight: @weight
+          }
+        )
+      end
     end
   end
 end

decidim-comments/app/events/decidim/comments/comment_voted_event.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Comments
+    class CommentVotedEvent < Decidim::Events::SimpleEvent
+      include Decidim::Comments::CommentEvent
+
+      delegate :author, to: :comment_vote
+
+      private
+
+      def comment_vote
+        @comment_vote ||= Decidim::Comments::CommentVote.find_by(decidim_comment_id: extra[:comment_id], decidim_author_id: extra[:author_id])
+      end
+
+      def resource_url_params
+        { anchor: "comment_#{comment.id}" }
+      end
+    end
+  end
+end

decidim-comments/app/frontend/comments/add_comment_form.component.tsx

@@ -28,7 +28,7 @@ interface AddCommentFormProps {
   submitButtonClassName?: string;
   autoFocus?: boolean;
   arguable?: boolean;
-  userAllowedToComment?: boolean;
+  userAllowedToComment?: number;
   addComment?: (data: { body: string, alignment: number, userGroupId?: string }, context: any) => void;
   onCommentAdded?: () => void;
   orderBy: string;
@@ -404,7 +404,7 @@ const AddCommentFormWithMutation = graphql<addCommentMutation, AddCommentFormPro
                 comments: [],
                 hasComments: false,
                 acceptsNewComments: false,
-                userAllowedToComment: false,
+                userAllowedToComment: 0,
                 upVotes: 0,
                 upVoted: false,
                 downVotes: 0,

decidim-comments/app/frontend/comments/comment.component.test.tsx

@@ -430,7 +430,7 @@ describe("<Comment />", () => {
 
   describe("when user is not allowed to comment", () => {
     beforeEach(() => {
-      comment.userAllowedToComment = false;
+      comment.userAllowedToComment = 0;
     });
 
     it("should not render reply button", () => {

decidim-comments/app/frontend/comments/comments.component.test.tsx

@@ -36,7 +36,7 @@ describe("<Comments commentsMaxLength={commentsMaxLength} />", () => {
         },
         commentable: {
           acceptsNewComments: true,
-          userAllowedToComment: true,
+          userAllowedToComment: 1,
           commentsHaveAlignment: true,
           commentsHaveVotes: true,
           totalCommentsCount: 15,
@@ -106,7 +106,7 @@ describe("<Comments commentsMaxLength={commentsMaxLength} />", () => {
   describe("when the commentable cannot accept new comments", () => {
     beforeEach(() => {
       commentable.acceptsNewComments = false;
-      commentable.userAllowedToComment = false;
+      commentable.userAllowedToComment = 0;
     });
 
     it("doesn't render an AddCommentForm component", () => {
@@ -122,7 +122,7 @@ describe("<Comments commentsMaxLength={commentsMaxLength} />", () => {
 
   describe("when the commentable can accept new comments but user is not allowed to comment", () => {
     beforeEach(() => {
-      commentable.userAllowedToComment = false;
+      commentable.userAllowedToComment = 0;
     });
 
     it("doesn't render an AddCommentForm component", () => {

decidim-comments/app/frontend/comments/comments.component.tsx

@@ -22,6 +22,7 @@ interface CommentsProps extends GetCommentsQuery {
   loading?: boolean;
   orderBy: string;
   singleCommentId?: string;
+  authorizationLink?: string;
   reorderComments: (orderBy: string) => void;
   commentsMaxLength: number;
 }
@@ -142,7 +143,7 @@ export class Comments extends React.Component<CommentsProps> {
   private _renderBlockedCommentsWarning() {
     const { commentable: { acceptsNewComments, userAllowedToComment } } = this.props;
 
-    if (!acceptsNewComments && !userAllowedToComment) {
+    if (!acceptsNewComments && userAllowedToComment !== 1) {
       return (
         <div className="callout warning">
           <p>{I18n.t("components.comments.blocked_comments_warning")}</p>
@@ -160,15 +161,25 @@ export class Comments extends React.Component<CommentsProps> {
    * @returns {Void|DOMElement} - A warning message or nothing.
    */
   private _renderBlockedCommentsForUserWarning() {
-    const { commentable: { acceptsNewComments, userAllowedToComment } } = this.props;
+    const { authorizationLink, commentable } = this.props;
+    const { acceptsNewComments, userAllowedToComment } = commentable;
+    const link = { __html: authorizationLink ? authorizationLink : I18n.t("components.comments.blocked_comments_for_unauthorized_user_warning") };
 
     if (acceptsNewComments) {
-      if (!userAllowedToComment) {
-        return (
-          <div className="callout warning">
-            <p>{I18n.t("components.comments.blocked_comments_for_user_warning")}</p>
-          </div>
-        );
+      if (userAllowedToComment !== 1) {
+        if (userAllowedToComment === -1) {
+          return (
+            <div className="callout warning">
+              <div dangerouslySetInnerHTML={link} />
+            </div>
+          );
+        } else {
+          return (
+            <div className="callout warning">
+              <p>{I18n.t("components.comments.blocked_comments_for_user_warning")}</p>
+            </div>
+          );
+        }
       }
     }
 
@@ -210,7 +221,7 @@ export class Comments extends React.Component<CommentsProps> {
       return null;
     }
 
-    if (acceptsNewComments && userAllowedToComment) {
+    if (acceptsNewComments && userAllowedToComment === 1) {
       return (
         <AddCommentForm
           session={session}
@@ -265,14 +276,15 @@ export interface CommentsApplicationProps extends GetCommentsQueryVariables {
   locale: string;
   toggleTranslations: boolean;
   commentsMaxLength: number;
+  authorizationLink: string;
 }
 
 /**
  * Wrap the CommentsWithData component within an Application component to
  * connect it with Apollo client and store.
  * @returns {ReactComponent} - A component wrapped within an Application component
  */
-const CommentsApplication: React.SFC<CommentsApplicationProps> = ({ locale, toggleTranslations, commentableId, commentableType, singleCommentId, commentsMaxLength }) => (
+const CommentsApplication: React.SFC<CommentsApplicationProps> = ({ locale, toggleTranslations, commentableId, commentableType, singleCommentId, commentsMaxLength, authorizationLink }) => (
   <Application locale={locale}>
     <CommentsWithData
       commentsMaxLength={commentsMaxLength}
@@ -282,6 +294,7 @@ const CommentsApplication: React.SFC<CommentsApplicationProps> = ({ locale, togg
       toggleTranslations={toggleTranslations}
       orderBy="older"
       singleCommentId={singleCommentId}
+      authorizationLink={authorizationLink}
     />
   </Application>
 );

decidim-comments/app/frontend/support/generate_comments_data.ts

@@ -32,7 +32,7 @@ const generateCommentsData = (num = 1) => {
       hasComments: false,
       comments: [],
       acceptsNewComments: true,
-      userAllowedToComment: true,
+      userAllowedToComment: 1,
       alignment: 0,
       upVotes: random.number(),
       upVoted: false,