Temp/0.25

Gemfile.lock

@@ -833,7 +833,7 @@ GEM
       activesupport
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    wkhtmltopdf-binary (0.12.6.5)
+    wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.5.1)

decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb

@@ -17,7 +17,6 @@ def permissions
           public_list_assemblies_action?
           public_read_assembly_action?
           public_list_members_action?
-          public_report_content_action?
           return permission_action
         end
 
@@ -125,13 +124,6 @@ def public_list_members_action?
         allow!
       end
 
-      def public_report_content_action?
-        return unless permission_action.action == :create &&
-                      permission_action.subject == :moderation
-
-        allow!
-      end
-
       # All users with a relation to a assembly and organization admins can enter
       # the space area. The sapce area is considered to be the assemblies zone,
       # not the assembly groups one.

decidim-assemblies/spec/permissions/decidim/assemblies/permissions_spec.rb

@@ -126,14 +126,6 @@
       it { is_expected.to eq true }
     end
 
-    context "when reporting a resource" do
-      let(:action) do
-        { scope: :public, action: :create, subject: :moderation }
-      end
-
-      it { is_expected.to eq true }
-    end
-
     context "when any other action" do
       let(:action) do
         { scope: :public, action: :foo, subject: :bar }

decidim-blogs/app/views/decidim/blogs/posts/_posts.html.erb

@@ -1,6 +1,9 @@
 <div class="row small-12">
   <% paginate_posts.each do |post| %>
     <div class="card card--post">
+      <% if post.photo.present? %>
+        <%= image_tag post.photo.url, class: "card__image" %>
+      <% end %>
       <div class="card__content">
         <div class="card__header">
           <%= link_to post, class: "card__link" do %>

decidim-blogs/spec/system/explore_posts_spec.rb

@@ -9,6 +9,8 @@
   let!(:old_post) { create(:post, component: component, created_at: Time.current - 2.days) }
   let!(:new_post) { create(:post, component: component, created_at: Time.current) }
 
+  let!(:image) { create(:attachment, attached_to: old_post) }
+
   describe "index" do
     it "shows all posts for the given process" do
       visit_component
@@ -17,6 +19,11 @@
       expect(page).to have_selector(".card--post", text: translated(old_post.title))
     end
 
+    it "shows images" do
+      visit_component
+      expect(page).to have_selector(".card--post img.card__image")
+    end
+
     it "shows comment counts" do
       visit_component
       expect(page).to have_selector('a[title="comments"]', text: "comment".pluralize(new_post.comments.count))

decidim-comments/app/models/decidim/comments/comment.rb

@@ -85,7 +85,7 @@ def visible?
       alias original_participatory_space participatory_space
       def participatory_space
         return original_participatory_space if original_participatory_space.present?
-        return root_commentable if root_commentable.is_a?(Decidim::Participable)
+        return root_commentable unless root_commentable.respond_to?(:participatory_space)
 
         root_commentable.participatory_space
       end

decidim-conferences/app/permissions/decidim/conferences/permissions.rb

@@ -20,7 +20,6 @@ def permissions
           public_list_program_action?
           public_list_media_links_action?
           public_list_registration_types_action?
-          public_report_content_action?
 
           can_join_conference?
           can_leave_conference?
@@ -159,13 +158,6 @@ def public_list_registration_types_action?
         allow!
       end
 
-      def public_report_content_action?
-        return unless permission_action.action == :create &&
-                      permission_action.subject == :moderation
-
-        allow!
-      end
-
       # All users with a relation to a conference and organization admins can enter
       # the space area. The sapce area is considered to be the conferences zone,
       # not the conference groups one.

decidim-conferences/spec/permissions/decidim/conferences/permissions_spec.rb

@@ -140,14 +140,6 @@
       it { is_expected.to eq true }
     end
 
-    context "when reporting a resource" do
-      let(:action) do
-        { scope: :public, action: :create, subject: :moderation }
-      end
-
-      it { is_expected.to eq true }
-    end
-
     context "when any other action" do
       let(:action) do
         { scope: :public, action: :foo, subject: :bar }

decidim-consultations/app/models/decidim/consultations/question.rb

@@ -66,6 +66,7 @@ class Question < ApplicationRecord
       delegate :start_voting_date, to: :consultation
       delegate :end_voting_date, to: :consultation
       delegate :results_published?, to: :consultation
+      delegate :moderators, to: :consultation
 
       alias participatory_space consultation
 

decidim-core/app/permissions/decidim/permissions.rb

@@ -10,6 +10,8 @@ def permissions
       component_public_action?
       search_scope_action?
 
+      public_report_content_action?
+
       return permission_action unless user
 
       user_manager_permissions
@@ -28,6 +30,13 @@ def permissions
 
     private
 
+    def public_report_content_action?
+      return unless permission_action.action == :create &&
+                    permission_action.subject == :moderation
+
+      allow!
+    end
+
     def read_public_pages_action?
       return unless permission_action.subject == :public_page &&
                     permission_action.action == :read

decidim-core/lib/decidim/has_attachments.rb

@@ -15,28 +15,35 @@ module HasAttachments
                inverse_of: :attached_to,
                as: :attached_to
 
-      # All the attachments that are photos for this process.
+      # The first attachment that is a photo for this model.
+      #
+      # Returns an Attachment
+      def photo
+        @photo ||= photos.first
+      end
+
+      # All the attachments that are photos for this model.
       #
       # Returns an Array<Attachment>
       def photos
         @photos ||= attachments.select(&:photo?)
       end
 
-      # All the attachments that are documents for this process.
+      # All the attachments that are documents for this model.
       #
       # Returns an Array<Attachment>
       def documents
         @documents ||= attachments.includes(:attachment_collection).select(&:document?)
       end
 
-      # All the attachments that are documents for this process that has a collection.
+      # All the attachments that are documents for this model that has a collection.
       #
       # Returns an Array<Attachment>
       def documents_with_collection
         documents.select(&:attachment_collection_id?)
       end
 
-      # All the attachments that are documents for this process that not has a collection.
+      # All the attachments that are documents for this model that not has a collection.
       #
       # Returns an Array<Attachment>
       def documents_without_collection

decidim-core/spec/permissions/decidim/permissions_spec.rb

@@ -32,6 +32,14 @@
     it { is_expected.to eq true }
   end
 
+  context "when reporting a resource" do
+    let(:action) do
+      { scope: :public, action: :create, subject: :moderation }
+    end
+
+    it { is_expected.to eq true }
+  end
+
   context "when reading a component" do
     let(:action) do
       { scope: :public, action: :read, subject: :component }

decidim-generators/spec/generators_spec.rb

@@ -102,14 +102,8 @@ module Decidim
         it_behaves_like "a new production application"
       end
 
-      context "with --edge flag" do
-        let(:command) { "decidim --edge #{test_app}" }
-
-        it_behaves_like "a new production application"
-      end
-
       context "with --branch flag" do
-        let(:default_branch) { "develop" }
+        let(:default_branch) { "release/0.25-stable" }
         let(:command) { "decidim --branch #{default_branch} #{test_app}" }
 
         it_behaves_like "a new production application"

decidim-initiatives/app/permissions/decidim/initiatives/permissions.rb

@@ -9,7 +9,6 @@ def permissions
         return permission_action if permission_action.scope != :public
 
         # Non-logged users permissions
-        public_report_content_action?
         list_public_initiatives?
         read_public_initiative?
         search_initiative_types_and_scopes?
@@ -154,13 +153,6 @@ def initiative_attachment?
         toggle_allow(initiative_type.attachments_enabled?)
       end
 
-      def public_report_content_action?
-        return unless permission_action.action == :create &&
-                      permission_action.subject == :moderation
-
-        allow!
-      end
-
       def sign_initiative?
         return unless permission_action.action == :sign_initiative &&
                       permission_action.subject == :initiative

decidim-meetings/app/cells/decidim/meetings/meeting_m_cell.rb

@@ -35,6 +35,14 @@ def description
 
       private
 
+      def resource_image_path
+        model.photo&.url
+      end
+
+      def has_image?
+        true
+      end
+
       def spans_multiple_dates?
         start_date != end_date
       end

decidim-meetings/spec/cells/decidim/meetings/meeting_m_cell_spec.rb

@@ -24,6 +24,14 @@ module Decidim::Meetings
         expect(cell_html).to have_no_content("Created at")
         expect(cell_html).to have_no_content(I18n.l(meeting.created_at.to_date, format: :decidim_short))
       end
+
+      context "when an image is attached to the meeting" do
+        let!(:attachment) { create(:attachment, attached_to: meeting) }
+
+        it "renders the picture" do
+          expect(cell_html).to have_css(".card__image")
+        end
+      end
     end
 
     context "when title contains special html entities" do

decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb

@@ -19,7 +19,6 @@ def permissions
           public_list_process_groups_action?
           public_read_process_group_action?
           public_read_process_action?
-          public_report_content_action?
           return permission_action
         end
 
@@ -119,13 +118,6 @@ def can_view_private_space?
         user.admin || process.users.include?(user)
       end
 
-      def public_report_content_action?
-        return unless permission_action.action == :create &&
-                      permission_action.subject == :moderation
-
-        allow!
-      end
-
       # Only organization admins can enter the process groups space area.
       def user_can_enter_process_groups_space_area?
         return unless permission_action.action == :enter &&

decidim-participatory_processes/spec/permissions/decidim/participatory_processes/permissions_spec.rb

@@ -134,14 +134,6 @@
       it { is_expected.to eq true }
     end
 
-    context "when reporting a resource" do
-      let(:action) do
-        { scope: :public, action: :create, subject: :moderation }
-      end
-
-      it { is_expected.to eq true }
-    end
-
     context "when any other action" do
       let(:action) do
         { scope: :public, action: :foo, subject: :bar }

decidim-proposals/app/cells/decidim/proposals/proposals_picker_cell.rb

@@ -6,7 +6,7 @@ module Decidim
   module Proposals
     # This cell renders a proposals picker.
     class ProposalsPickerCell < Decidim::ViewModel
-      MAX_PROPOSALS = 1000
+      MAX_PROPOSALS = 2000
 
       def show
         if filtered?

decidim_app-design/Gemfile.lock

@@ -833,7 +833,7 @@ GEM
       activesupport
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    wkhtmltopdf-binary (0.12.6.5)
+    wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.5.1)