decidim-core 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 889376b1a7af947c4cfdd5c6182211e66a1feebb
-  data.tar.gz: 8257ffd74960e6fe3f2ccdac75c8fbda7c67f634
+  metadata.gz: eb2a449a263f71206457574b6624f360c107ca44
+  data.tar.gz: 3f6a5a14ea188fe87e6a19e421c254c385bbde79
 SHA512:
-  metadata.gz: 8b9c5be3cb7b7a5878fb33ba611b452e56ee998dffc1a361483858fe714c63d382b74b128d6e531f50c329c31fe5c8aee4ed9b56a873570a41bd799b026ebd3c
-  data.tar.gz: 9c1c5e92003d02865b8b78bd31b52d13047536b9e46538ac52003f6831e9feae527ddaf12d410d948d823a02ed07ac55cd5a967f58432ff90354afb17cc47420
+  metadata.gz: df0da6dbd26020853ca158762a6a3cd787ef2a51fa6ed2b930ec90092170df0ed5ef7e1d65f9fe0bbbb62df978e160260cb91f81f30064f32ee7fcef34fffb32
+  data.tar.gz: 0a20c1fc7ca7669fcec1b0f6a544f5710817a208b0213b625ffc56cf95138fab5528b9f85480f660b9330a1d0cc8c4dd2fbe58ea107e982aec55dc04c5cd830d

data/app/assets/stylesheets/decidim/modules/_card-grid.scss

@@ -3,7 +3,7 @@ $card-grid-margin-bottom: map-get($grid-column-gutter, medium);
 .card-grid{
   display: flex;
   flex-wrap: wrap;
-  
+
   &:before{
     width: 0; //fixes a flexbox bug in Safari with the clearfix element
   }
@@ -18,7 +18,7 @@ $card-grid-margin-bottom: map-get($grid-column-gutter, medium);
     flex-direction: column;
     height: 100%;
   }
-  
+
   .card__content{
     flex-grow: 1;
   }

data/app/assets/stylesheets/decidim/modules/_filters.scss

@@ -70,12 +70,12 @@ $filters-padding-y: 1rem;
     padding-bottom: $filters-padding-x*1.5;
     border-bottom: none;
   }
-  
+
   label{
     line-height: 1.2;
     margin-bottom: .4rem;
   }
-  
+
   .button{
     margin-bottom: 0;
   }
@@ -93,4 +93,4 @@ $filters-padding-y: 1rem;
   .input-group{
     margin-bottom: 0;
   }
-}
+}

data/app/assets/stylesheets/decidim/modules/_main-container.scss

@@ -41,10 +41,6 @@ $container-padding-2y: 2rem;
   }
 }
 
-.side-panel__content{
-  
-}
-
 .side-panel__tabs{
   border: none;
   .tabs-title{
@@ -67,4 +63,4 @@ $container-padding-2y: 2rem;
       box-shadow: inset 4px 0 0 $primary;
     }
   }
-}
+}

data/app/assets/stylesheets/decidim/modules/_process-nav.scss

@@ -77,7 +77,6 @@
   font-weight: 600;
   display: flex;
   align-items: center;
- 
 
   svg{
     margin-right: .4em;
@@ -95,4 +94,4 @@
       fill: $primary;
     }
   }
-}
+}

data/app/constraints/decidim/current_participatory_process.rb

@@ -29,7 +29,7 @@ module Decidim
     end
 
     def detect_current_participatory_process(params)
-      @organization.participatory_processes.find_by_id(params["participatory_process_id"])
+      OrganizationParticipatoryProcesses.new(@organization).query.find_by_id(params["participatory_process_id"])
     end
   end
 end

data/app/controllers/concerns/decidim/needs_authorization.rb

@@ -22,7 +22,7 @@ module Decidim
       end
 
       def current_ability_klass
-        Decidim::Ability
+        Decidim::Abilities::BaseAbility
       end
 
       def ability_context
@@ -30,8 +30,7 @@ module Decidim
           current_settings: try(:current_settings),
           feature_settings: try(:feature_settings),
           current_organization: try(:current_organization),
-          current_feature: try(:current_feature),
-          current_participatory_process: try(:current_participatory_process)
+          current_feature: try(:current_feature)
         }
       end
 

data/app/controllers/concerns/decidim/needs_participatory_process.rb

@@ -39,7 +39,7 @@ module Decidim
 
       def detect_participatory_process
         request.env["current_participatory_process"] ||
-          current_organization.participatory_processes.find(params[:participatory_process_id] || params[:id])
+          OrganizationParticipatoryProcesses.new(current_organization).query.find(params[:participatory_process_id] || params[:id])
       end
     end
   end

data/app/controllers/concerns/decidim/{feature_settings.rb → settings.rb}

@@ -5,7 +5,7 @@ require "active_support/concern"
 module Decidim
   # This concern groups methods and helpers related to accessing the settings
   # of a feature from a controller.
-  module FeatureSettings
+  module Settings
     extend ActiveSupport::Concern
 
     included do

data/app/controllers/decidim/features/base_controller.rb

@@ -8,7 +8,7 @@ module Decidim
     class BaseController < Decidim::ApplicationController
       layout "layouts/decidim/participatory_process"
       include NeedsParticipatoryProcess
-      include FeatureSettings
+      include Settings
       include ActionAuthorization
 
       helper Decidim::FiltersHelper
@@ -47,7 +47,6 @@ module Decidim
       def ability_context
         super.merge(
           current_manifest: current_manifest,
-          current_participatory_process: current_participatory_process,
           current_settings: current_settings,
           feature_settings: feature_settings
         )

data/app/controllers/decidim/pages_controller.rb

@@ -30,7 +30,7 @@ module Decidim
 
     def highlighted_participatory_processes
       @highlighted_participatory_processes ||=
-        OrganizationParticipatoryProcesses.new(current_organization) | HighlightedParticipatoryProcesses.new
+        OrganizationPublishedParticipatoryProcesses.new(current_organization) | HighlightedParticipatoryProcesses.new
     end
 
     private

data/app/helpers/decidim/feature_path_helper.rb

@@ -8,7 +8,7 @@ module Decidim
     # feature - the Feature we want to find the root path for.
     #
     # Returns a url.
-    def feature_path(feature)
+    def main_feature_path(feature)
       feature_root_path_for(feature.manifest.engine, feature)
     end
 

data/{lib → app/models}/decidim/abilities/admin_ability.rb

@@ -18,6 +18,7 @@ module Decidim
       def define_abilities
         can :read, :admin_dashboard
         can :read, ParticipatoryProcess
+        can :read, Feature
       end
 
       def admin?

data/app/models/decidim/abilities/base_ability.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Abilities
+    # Defines the abilities for a User. Intended to be used with `cancancan`.
+    class BaseAbility
+      include CanCan::Ability
+
+      # Initializes the ability class for the given user. Automatically merges
+      # injected abilities fmor the configuration. In order to inject more
+      # abilities, add this code in the `engine.rb` file of your own engine, for
+      # example, inside an initializer:
+      #
+      #   Decidim.configure do |config|
+      #     config.abilities << Decidim::MyEngine::Abilities::MyAbility
+      #   end
+      #
+      # Note that, in development, this will force you to restart the server
+      # every time you change things in your ability classes.
+      #
+      # user - the User that needs its abilities checked.
+      # context - a Hash with some context related to the current request.
+      def initialize(user, context = {})
+        Decidim.abilities.each do |ability|
+          merge ability.constantize.new(user, context)
+        end
+
+        can :manage, Authorization do |authorization|
+          authorization.user == user
+        end
+      end
+    end
+  end
+end

data/{lib → app/models}/decidim/abilities/participatory_process_admin_ability.rb

@@ -18,6 +18,10 @@ module Decidim
         can :read, ParticipatoryProcess do |process|
           can_manage_process?(process)
         end
+
+        can :read, Feature do |feature|
+          can_manage_process?(feature.participatory_process)
+        end
       end
     end
   end

data/{lib → app/models}/decidim/abilities/participatory_process_collaborator_ability.rb

@@ -18,6 +18,10 @@ module Decidim
         can :read, ParticipatoryProcess do |process|
           can_manage_process?(process)
         end
+
+        can :read, Feature do |feature|
+          can_manage_process?(feature.participatory_process)
+        end
       end
     end
   end

data/app/models/decidim/feature.rb

@@ -5,6 +5,9 @@ module Decidim
   # defined via a FeatureManifest. It's meant to be able to provide a single
   # feature that spans over several steps.
   class Feature < ApplicationRecord
+    include HasSettings
+    include Publicable
+
     belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id"
     has_one :organization, through: :participatory_process
     has_many :categories, through: :participatory_process
@@ -12,31 +15,6 @@ module Decidim
 
     default_scope { order(arel_table[:weight].asc) }
 
-    after_initialize :default_values
-
-    # Public: Filters the features that are published and, therefore, visible by
-    # the end user.
-    #
-    # Returns an ActiveRecord::Relation.
-    def self.published
-      where.not(published_at: nil)
-    end
-
-    # Public: Filters the features that are unpublished and, therefore, not visible
-    # by the end user.
-    #
-    # Returns an ActiveRecord::Relation.
-    def self.unpublished
-      where(published_at: nil)
-    end
-
-    # Public: Finds out whether this feature is published.
-    #
-    # Returns true if published, false otherwise.
-    def published?
-      published_at.present?
-    end
-
     # Public: Finds the manifest this feature is associated to.
     #
     # Returns a FeatureManifest.
@@ -53,62 +31,9 @@ module Decidim
       self.manifest_name = manifest.name
     end
 
-    def settings
-      settings_schema(:global).new(self[:settings]["global"])
-    end
-
-    def settings=(data)
-      self[:settings]["global"] = serialize_settings(settings_schema(:global), data)
-    end
-
-    def default_step_settings
-      settings_schema(:step).new(self[:settings]["default_step"])
-    end
-
-    def default_step_settings=(data)
-      self[:settings]["default_step"] = serialize_settings(settings_schema(:step), data)
-    end
-
-    def step_settings
-      participatory_process.steps.each_with_object({}) do |step, result|
-        result[step.id.to_s] = settings_schema(:step).new(self[:settings].dig("steps", step.id.to_s))
-      end
-    end
-
-    def step_settings=(data)
-      self[:settings]["steps"] = data.each_with_object({}) do |(key, value), result|
-        result[key.to_s] = serialize_settings(settings_schema(:step), value)
-      end
-    end
-
-    def active_step_settings
-      active_step = participatory_process.active_step
-      return default_step_settings unless active_step
-
-      step_settings.fetch(active_step.id.to_s)
-    end
-
     # Public: Returns the value of the registered primary stat.
     def primary_stat
       @primary_stat ||= manifest.stats.filter(primary: true).with_context([self]).map { |name, value| [name, value] }.first&.last
     end
-
-    private
-
-    def serialize_settings(schema, value)
-      if value.respond_to?(:attributes)
-        value.attributes
-      else
-        schema.new(value)
-      end
-    end
-
-    def settings_schema(name)
-      manifest.settings(name.to_sym).schema
-    end
-
-    def default_values
-      self[:settings] ||= {}
-    end
   end
 end

data/app/models/decidim/organization.rb

@@ -7,8 +7,6 @@ module Decidim
   class Organization < ApplicationRecord
     SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
 
-    has_many :participatory_process_groups, foreign_key: "decidim_organization_id", class_name: "Decidim::ParticipatoryProcessGroup", inverse_of: :organization
-    has_many :participatory_processes, foreign_key: "decidim_organization_id", class_name: "Decidim::ParticipatoryProcess", inverse_of: :organization
     has_many :static_pages, foreign_key: "decidim_organization_id", class_name: "Decidim::StaticPage", inverse_of: :organization
     has_many :scopes, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Scope", inverse_of: :organization
     has_many :admins, -> { where(admin: true) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"

data/app/models/decidim/participatory_process.rb

@@ -8,11 +8,11 @@ module Decidim
   # active.
   class ParticipatoryProcess < ApplicationRecord
     include Decidim::HasAttachments
+    include Decidim::Publicable
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
-               class_name: "Decidim::Organization",
-               inverse_of: :participatory_processes
+               class_name: "Decidim::Organization"
     belongs_to :participatory_process_group,
                foreign_key: "decidim_participatory_process_group_id",
                class_name: "Decidim::ParticipatoryProcessGroup",
@@ -50,13 +50,6 @@ module Decidim
     mount_uploader :hero_image, Decidim::HeroImageUploader
     mount_uploader :banner_image, Decidim::BannerImageUploader
 
-    # Scope to return only the published processes.
-    #
-    # Returns an ActiveRecord::Relation.
-    def self.published
-      where.not(published_at: nil)
-    end
-
     # Scope to return only the promoted processes.
     #
     # Returns an ActiveRecord::Relation.
@@ -64,13 +57,6 @@ module Decidim
       where(promoted: true)
     end
 
-    # Checks whether the process has been published or not.
-    #
-    # Returns a boolean.
-    def published?
-      published_at.present?
-    end
-
     def hashtag
       attributes["hashtag"].to_s.delete("#")
     end

data/app/models/decidim/participatory_process_group.rb

@@ -8,8 +8,7 @@ module Decidim
              inverse_of: :participatory_process_group
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
-               class_name: "Decidim::Organization",
-               inverse_of: :participatory_process_groups
+               class_name: "Decidim::Organization"
 
     mount_uploader :hero_image, Decidim::HeroImageUploader
   end

data/app/models/decidim/participatory_process_user_role.rb

@@ -9,5 +9,14 @@ module Decidim
 
     ROLES = %w(admin collaborator moderator).freeze
     validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :participatory_process] }
+    validate :user_and_participatory_process_same_organization
+
+    private
+
+    # Private: check if the process and the user have the same organization
+    def user_and_participatory_process_same_organization
+      return if !participatory_process || !user
+      errors.add(:participatory_process, :invalid) unless user.organization == participatory_process.organization
+    end
   end
 end

data/app/models/decidim/user.rb

@@ -33,13 +33,6 @@ module Decidim
     # Returns a String.
     attr_accessor :invitation_instructions
 
-    delegate :can?, to: :ability
-
-    # Gets the ability instance for the given user.
-    def ability
-      @ability ||= Ability.new(self)
-    end
-
     # Public: returns the user's name or the default one
     def name
       super || I18n.t("decidim.anonymous_user")

data/app/presenters/decidim/home_stats_presenter.rb

@@ -75,7 +75,7 @@ module Decidim
     end
 
     def published_features
-      @published_features ||= Feature.where(participatory_process: organization.participatory_processes.published).published
+      @published_features ||= Feature.where(participatory_process: OrganizationPublishedParticipatoryProcesses.new(organization).query).published
     end
   end
 end