decidim-participatory_processes 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe2a58eda97cb9b19d2401bea9c6901760d0df4
-  data.tar.gz: 3ee35753bce801e43fb470316d74350e60dcfd48
+  metadata.gz: 8c445e5c40610e2abaa330924ed46b5b5ebeb46a
+  data.tar.gz: 51ae4c255237951f19d1a0456361a594d5e5cb2c
 SHA512:
-  metadata.gz: c1d9d9f4d256aecac593dde0084f088fd06c5c8437a6fbdbb762c1fff07d4cc785f2e10348dedf2a769d65b75b5d96e7f42a84aaf3c4c00b1339ca60b3e34799
-  data.tar.gz: 1a1d842893e8b0059cc55b3a045a59bca005a65b73b64a03800191b3531072256f6d9fe7b5d305e8ee7ac1e3eadc209fc31b83734843664b2e01d904e75528de
+  metadata.gz: 3d0e2181a9bc060dc94889101958b00c82d904ba29404972e4b54e5039387a9c6a605168ce7cd2f784be63f951191043a64ef6eb90c9bfcfa37fc3d9e7ca4a5c
+  data.tar.gz: 36632affaef3539c1a99d1d135ca0a0eebec4336447ed9aa4009f88fbcf322088f4cc571bc9f2bc3fa1029a6ed8f48acf1c5e4782935e7171587bbd15e12dec4

data/app/controllers/decidim/participatory_processes/admin/concerns/participatory_process_admin.rb

@@ -13,11 +13,20 @@ module Decidim
           extend ActiveSupport::Concern
 
           included do
-            include NeedsParticipatoryProcess
+            include Decidim::Admin::ParticipatorySpaceAdminContext
+            helper_method :current_participatory_process
+            participatory_space_admin_layout
 
-            layout "decidim/admin/participatory_process"
+            def organization_processes
+              @organization_processes ||= OrganizationParticipatoryProcesses.new(current_organization).query
+            end
 
-            alias_method :current_participatory_space, :current_participatory_process
+            def current_participatory_space
+              request.env["current_participatory_space"] ||
+                organization_processes.find_by!(slug: params[:participatory_process_slug] || params[:slug])
+            end
+
+            alias_method :current_participatory_process, :current_participatory_space
           end
         end
       end

data/app/controllers/decidim/participatory_processes/admin/participatory_processes_controller.rb

@@ -6,6 +6,9 @@ module Decidim
       # Controller that allows managing participatory processes.
       #
       class ParticipatoryProcessesController < Decidim::Admin::ApplicationController
+        include Decidim::Admin::ParticipatorySpaceAdminContext
+        participatory_space_admin_layout only: [:edit]
+
         helper ProcessGroupsForSelectHelper
 
         helper_method :current_participatory_process
@@ -80,6 +83,10 @@ module Decidim
 
         private
 
+        def current_participatory_space
+          current_participatory_process
+        end
+
         def current_participatory_process
           @current_participatory_process ||= collection.where(slug: params[:slug]).or(
             collection.where(id: params[:slug])
@@ -91,7 +98,7 @@ module Decidim
         end
 
         def ability_context
-          super.merge(current_participatory_process: current_participatory_process)
+          super.merge(current_participatory_space: current_participatory_process)
         end
 
         def participatory_process_params

data/app/controllers/decidim/participatory_processes/participatory_process_steps_controller.rb

@@ -5,15 +5,20 @@ module Decidim
     # A controller that holds the logic to show ParticipatoryProcessSteps in a
     # public layout.
     class ParticipatoryProcessStepsController < Decidim::ApplicationController
-      helper_method :participatory_process, :current_participatory_process
-      layout "layouts/decidim/participatory_process", only: [:index]
-      include NeedsParticipatoryProcess
-
-      helper ParticipatoryProcessHelper
-      helper Decidim::IconHelper
+      include ParticipatorySpaceContext
+      participatory_space_layout only: :index
 
       def index
-        authorize! :read, ParticipatoryProcess
+      end
+
+      private
+
+      def organization_participatory_processes
+        @organization_participatory_processes ||= OrganizationParticipatoryProcesses.new(current_organization).query
+      end
+
+      def current_participatory_space
+        @current_participatory_space ||= organization_participatory_processes.find_by(slug: params[:participatory_process_slug])
       end
     end
   end

data/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb

@@ -5,9 +5,8 @@ module Decidim
     # A controller that holds the logic to show ParticipatoryProcesses in a
     # public layout.
     class ParticipatoryProcessesController < Decidim::ApplicationController
-      layout "layouts/decidim/participatory_process", only: [:show]
-
-      before_action -> { extend NeedsParticipatoryProcess }, only: [:show]
+      include ParticipatorySpaceContext
+      participatory_space_layout only: :show
 
       helper Decidim::AttachmentsHelper
       helper Decidim::IconHelper
@@ -25,12 +24,18 @@ module Decidim
         authorize! :read, ParticipatoryProcessGroup
       end
 
-      def show
-        authorize! :read, current_participatory_process
-      end
+      def show; end
 
       private
 
+      def organization_participatory_processes
+        @organization_participatory_processes ||= OrganizationParticipatoryProcesses.new(current_organization).query
+      end
+
+      def current_participatory_space
+        @current_participatory_space ||= organization_participatory_processes.find_by(slug: params[:slug])
+      end
+
       def published_processes
         @published_processes ||= OrganizationPublishedParticipatoryProcesses.new(current_organization)
       end
@@ -56,7 +61,7 @@ module Decidim
       end
 
       def stats
-        @stats ||= ParticipatoryProcessStatsPresenter.new(participatory_process: current_participatory_process)
+        @stats ||= ParticipatoryProcessStatsPresenter.new(participatory_process: current_participatory_space)
       end
 
       def filter

data/app/helpers/decidim/participatory_processes/participatory_process_helper.rb

@@ -10,7 +10,7 @@ module Decidim
       # participatory_process_step - The step to format to
       #
       # Returns a String with the formatted dates.
-      def participatory_process_step_dates(participatory_process_step)
+      def step_dates(participatory_process_step)
         dates = [participatory_process_step.start_date, participatory_process_step.end_date]
         dates.map { |date| date ? localize(date.to_date, format: :default) : "?" }.join(" - ")
       end

data/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb

@@ -5,7 +5,7 @@
   <div class="timeline__info">
     <div class="timeline__header">
       <span class="timeline__date text-small">
-        <%= participatory_process_step_dates(participatory_process_step) %>
+        <%= participatory_space_helpers.step_dates(participatory_process_step) %>
       </span>
       <h6 class="timeline__title heading6"><%= translated_attribute(participatory_process_step.title) %></h6>
     </div>

data/app/views/decidim/participatory_processes/participatory_process_steps/_timeline.html.erb

@@ -1,6 +1,6 @@
 <ol class="timeline">
   <% past_step = true %>
-  <% current_participatory_process.steps.each do |step| %>
+  <% current_participatory_space.steps.each do |step| %>
     <%= render step, step_status_class: step_class(step, past_step)  %>
     <% past_step = false if step.active? %>
   <% end %>

data/app/views/decidim/participatory_processes/participatory_processes/_statistics.html.erb

@@ -1,6 +1,6 @@
 <section class="extended" id="participatory_process-statistics" class="statistics">
   <div class="row column">
-    <h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.participatory_processes", participatory_process: translated_attribute(current_participatory_process.title)) %></h3>
+    <h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.participatory_processes", participatory_process: translated_attribute(current_participatory_space.title)) %></h3>
   </div>
   <div class="row">
     <div class="columns small-centered mediumlarge-12 large-12 process_stats">

data/app/views/decidim/participatory_processes/participatory_processes/show.html.erb

@@ -1,13 +1,13 @@
 <% add_decidim_meta_tags({
-  image_url: current_participatory_process.hero_image.url,
-  description: translated_attribute(current_participatory_process.short_description),
-  title: translated_attribute(current_participatory_process.title),
-  url: participatory_process_url(current_participatory_process),
+  image_url: current_participatory_space.hero_image.url,
+  description: translated_attribute(current_participatory_space.short_description),
+  title: translated_attribute(current_participatory_space.title),
+  url: participatory_process_url(current_participatory_space),
   twitter_handler: current_organization.twitter_handler
 }) %>
 
-<% if translated_attribute(current_participatory_process.announcement).present? %>
-  <%= render partial: "decidim/shared/announcement", locals: { announcement: current_participatory_process.announcement } %>
+<% if translated_attribute(current_participatory_space.announcement).present? %>
+  <%= render partial: "decidim/shared/announcement", locals: { announcement: current_participatory_space.announcement } %>
 <% end %>
 
 <div class="row column">
@@ -15,75 +15,75 @@
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
         <div class="lead">
-          <%= decidim_sanitize translated_attribute(current_participatory_process.short_description) %>
+          <%= decidim_sanitize translated_attribute(current_participatory_space.short_description) %>
         </div>
-        <%= decidim_sanitize translated_attribute(current_participatory_process.description) %>
+        <%= decidim_sanitize translated_attribute(current_participatory_space.description) %>
       </div>
-      <%= attachments_for current_participatory_process %>
+      <%= attachments_for current_participatory_space %>
     </div>
     <div class="section columns medium-5 mediumlarge-4 large-3">
       <div class="card extra definition-data">
-        <% if translated_attribute(current_participatory_process.participatory_scope).present? %>
+        <% if translated_attribute(current_participatory_space.participatory_scope).present? %>
           <div class="definition-data__item participatory_scope">
             <span class="definition-data__title"><%= t("participatory_processes.show.participatory_scope", scope: "decidim") %></span>
-            <%= translated_attribute(current_participatory_process.participatory_scope) %>
+            <%= translated_attribute(current_participatory_space.participatory_scope) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_participatory_process.target).present? %>
+        <% if translated_attribute(current_participatory_space.target).present? %>
           <div class="definition-data__item target">
             <span class="definition-data__title"><%= t("participatory_processes.show.target", scope: "decidim") %></span>
-            <%= translated_attribute(current_participatory_process.target) %>
+            <%= translated_attribute(current_participatory_space.target) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_participatory_process.participatory_structure).present? %>
+        <% if translated_attribute(current_participatory_space.participatory_structure).present? %>
           <div class="definition-data__item participatory_structure">
             <span class="definition-data__title"><%= t("participatory_processes.show.participatory_structure", scope: "decidim") %></span>
-            <%= translated_attribute(current_participatory_process.participatory_structure) %>
+            <%= translated_attribute(current_participatory_space.participatory_structure) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_participatory_process.meta_scope).present? %>
+        <% if translated_attribute(current_participatory_space.meta_scope).present? %>
           <div class="definition-data__item scope">
             <span class="definition-data__title"><%= t("participatory_processes.show.scope", scope: "decidim") %></span>
-              <%= translated_attribute(current_participatory_process.meta_scope) %>
+              <%= translated_attribute(current_participatory_space.meta_scope) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_participatory_process.local_area).present? %>
+        <% if translated_attribute(current_participatory_space.local_area).present? %>
           <div class="definition-data__item local_area">
             <span class="definition-data__title"><%= t("participatory_processes.show.local_area", scope: "decidim") %></span>
-            <%= translated_attribute(current_participatory_process.local_area) %>
+            <%= translated_attribute(current_participatory_space.local_area) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_participatory_process.developer_group).present? %>
+        <% if translated_attribute(current_participatory_space.developer_group).present? %>
           <div class="definition-data__item developer-group">
             <span class="definition-data__title"><%= t("participatory_processes.show.developer_group", scope: "decidim") %></span>
-            <%= translated_attribute(current_participatory_process.developer_group) %>
+            <%= translated_attribute(current_participatory_space.developer_group) %>
           </div>
         <% end %>
 
-        <% if current_participatory_process.start_date.present? %>
+        <% if current_participatory_space.start_date.present? %>
           <div class="definition-data__item start-date">
             <span class="definition-data__title"><%= t("participatory_processes.show.start_date", scope: "decidim") %></span>
-              <%== l(current_participatory_process.start_date, format: :long) %>
+              <%== l(current_participatory_space.start_date, format: :long) %>
           </div>
         <% end %>
 
-        <% if current_participatory_process.end_date.present? %>
+        <% if current_participatory_space.end_date.present? %>
           <div class="definition-data__item end-date">
             <span class="definition-data__title"><%= t("participatory_processes.show.end_date", scope: "decidim") %></span>
-              <%== l(current_participatory_process.end_date, format: :long) %>
+              <%== l(current_participatory_space.end_date, format: :long) %>
           </div>
         <% end %>
       </div>
       <%= render partial: "decidim/shared/share_modal" %>
-      <%= embed_modal_for participatory_process_participatory_process_widget_url(current_participatory_process, format: :js) %>
+      <%= embed_modal_for participatory_process_participatory_process_widget_url(current_participatory_space, format: :js) %>
     </div>
   </div>
-  <% if current_participatory_process.show_statistics? %>
+  <% if current_participatory_space.show_statistics? %>
     <%= render partial: 'statistics' %>
   <% end %>
 </div>

data/app/views/layouts/decidim/_process_header.html.erb

@@ -1,28 +1,28 @@
 <div class="process-header row column">
   <div class="row column process-header__main"
-       style="background-image:url(<%= current_participatory_process.banner_image.url %>);">
+       style="background-image:url(<%= current_participatory_space.banner_image.url %>);">
     <div class="process-header__container row">
       <div class="columns mediumlarge-9 process-header__info">
         <div>
           <h1 class="text-highlight heading2">
-            <%= translated_attribute(current_participatory_process.title) %>
+            <%= translated_attribute(current_participatory_space.title) %>
           </h1>
         </div>
         <div>
           <h2 class="text-highlight heading-small">
-            <% if current_participatory_process.hashtag.present? %>
+            <% if current_participatory_space.hashtag.present? %>
               <span class="process-header__hashtag">
-                <%= link_to "##{current_participatory_process.hashtag}", "https://twitter.com/hashtag/#{current_participatory_process.hashtag}" %>
+                <%= link_to "##{current_participatory_space.hashtag}", "https://twitter.com/hashtag/#{current_participatory_space.hashtag}" %>
               </span>
             <% end %>
-            <%= translated_attribute(current_participatory_process.subtitle) %>
+            <%= translated_attribute(current_participatory_space.subtitle) %>
           </h2>
         </div>
       </div>
-      <%= render partial: "layouts/decidim/process_header_steps", locals: { participatory_process: current_participatory_process } %>
+      <%= render partial: "layouts/decidim/process_header_steps", locals: { participatory_process: current_participatory_space } %>
     </div>
   </div>
-  <% if current_participatory_process.features.any? %>
+  <% if current_participatory_space.features.any? %>
     <div class="row column">
       <div class="process-nav">
         <button class="process-nav__trigger hide-for-medium"  data-toggle="process-nav-content">
@@ -39,14 +39,14 @@
         </button>
         <div class="row column process-nav__content is-active" id="process-nav-content" data-toggler=".is-active">
           <ul>
-            <li class="<%= "is-active" if is_active_link?(decidim_participatory_processes.participatory_process_path(current_participatory_process), :exclusive) %>">
-              <%= active_link_to decidim_participatory_processes.participatory_process_path(current_participatory_process), active: :exclusive, class: "process-nav__link", class_active: "is-active" do %>
+            <li class="<%= "is-active" if is_active_link?(decidim_participatory_processes.participatory_process_path(current_participatory_space), :exclusive) %>">
+              <%= active_link_to decidim_participatory_processes.participatory_process_path(current_participatory_space), active: :exclusive, class: "process-nav__link", class_active: "is-active" do %>
                 <%= external_icon "decidim/participatory_processes/process.svg" %>
                 <%= t ".process_menu_item" %>
               <% end %>
             </li>
 
-            <% current_participatory_process.features.each do |feature| %>
+            <% current_participatory_space.features.each do |feature| %>
               <% if feature.published? || feature == self.try(:current_feature) %>
                 <li class="<%= "is-active" if is_active_link?(main_feature_path(feature), :inclusive) %>">
                   <%= active_link_to main_feature_path(feature), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>

data/app/views/layouts/decidim/_process_header_steps.html.erb

@@ -13,15 +13,15 @@
             <% past_step = false if step.active? %>
           <% end %>
         </ol>
-        <span class="phase-current"><%= t(".step", current: (participatory_process.active_step.position + 1), total: current_participatory_process.steps.count) %></span>
+        <span class="phase-current"><%= t(".step", current: (participatory_process.active_step.position + 1), total: current_participatory_space.steps.count) %></span>
       </div>
       <div>
         <span class="phase-title"><%= translated_attribute participatory_process.active_step.title %></span>
         <span class="phase-date">
-          <%= participatory_process_step_dates participatory_process.active_step %>
+          <%= participatory_space_helpers.step_dates participatory_process.active_step %>
         </span>
       </div>
-      <%= link_to t('.view_steps'), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_process), class: "button tiny hollow" %>
+      <%= link_to t('.view_steps'), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space), class: "button tiny hollow" %>
     </div>
   </div>
 <% end %>

data/app/views/layouts/decidim/admin/participatory_process.html.erb

@@ -1,23 +1,23 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
-      <% if can? :update, current_participatory_process %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.edit_participatory_process_path(current_participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.edit_participatory_process_path(current_participatory_process) %>
+      <% if can? :update, current_participatory_space %>
+        <li <% if is_active_link?(decidim_admin_participatory_processes.edit_participatory_process_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.edit_participatory_process_path(current_participatory_space) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::ParticipatoryProcessStep %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_steps_path(current_participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("steps", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_steps_path(current_participatory_process) %>
+        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_steps_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("steps", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_steps_path(current_participatory_space) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Feature %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.features_path(current_participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.features_path(current_participatory_process) %>
+        <li <% if is_active_link?(decidim_admin_participatory_processes.features_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.features_path(current_participatory_space) %>
           <ul>
-            <% current_participatory_process.features.each do |feature| %>
+            <% current_participatory_space.features.each do |feature| %>
               <% if feature.manifest.admin_engine %>
-                <li <% if is_active_link?(manage_feature_path(feature)) || is_active_link?(decidim_admin_participatory_processes.edit_feature_path(current_participatory_process, feature)) || is_active_link?(decidim_admin_participatory_processes.edit_feature_permissions_path(current_participatory_process, feature)) %> class="is-active" <% end %>>
+                <li <% if is_active_link?(manage_feature_path(feature)) || is_active_link?(decidim_admin_participatory_processes.edit_feature_path(current_participatory_space, feature)) || is_active_link?(decidim_admin_participatory_processes.edit_feature_permissions_path(current_participatory_space, feature)) %> class="is-active" <% end %>>
                   <%= link_to manage_feature_path(feature) do %>
                     <%= translated_attribute feature.name %>
                     <% if feature.primary_stat.present? %>
@@ -31,23 +31,23 @@
         </li>
       <% end %>
       <% if can? :read, Decidim::Category %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.categories_path(current_participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.categories_path(current_participatory_process) %>
+        <li <% if is_active_link?(decidim_admin_participatory_processes.categories_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.categories_path(current_participatory_space) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Attachment %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_attachments_path(current_participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_attachments_path(current_participatory_process) %>
+        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_attachments_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_attachments_path(current_participatory_space) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::ParticipatoryProcessUserRole %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_user_roles_path(current_participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("process_admins", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_user_roles_path(current_participatory_process) %>
+        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_user_roles_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("process_admins", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_user_roles_path(current_participatory_space) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Moderation %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.moderations_path(current_participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.moderations_path(current_participatory_process) %>
+        <li <% if is_active_link?(decidim_admin_participatory_processes.moderations_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.moderations_path(current_participatory_space) %>
         </li>
       <% end %>
     </ul>
@@ -57,7 +57,7 @@
 <%= render "layouts/decidim/admin/application" do %>
   <div class="process-title">
     <div class="process-title-content">
-      <%= translated_attribute(current_participatory_process.title) %>
+      <%= translated_attribute(current_participatory_space.title) %>
     </div>
   </div>
   <%= yield %>

data/app/views/layouts/decidim/participatory_process.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(translated_attribute(current_feature.name)) if try(:current_feature) %>
-<% add_decidim_page_title(translated_attribute(current_participatory_process.title)) %>
+<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
 <% add_decidim_meta_tags(
-  image_url: current_participatory_process.banner_image.url,
-  description: translated_attribute(current_participatory_process.short_description),
+  image_url: current_participatory_space.banner_image.url,
+  description: translated_attribute(current_participatory_space.short_description),
 ) %>
 
 <%= render "layouts/decidim/application" do %>
@@ -23,4 +23,4 @@
   <%= render "layouts/decidim/feature_authorization_modals" %>
 <% end %>
 
-<% provide :meta_image_url, current_participatory_process.banner_image.url %>
+<% provide :meta_image_url, current_participatory_space.banner_image.url %>

data/lib/decidim/participatory_processes/participatory_space.rb

@@ -1,11 +1,20 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:participatory_processes) do |participatory_space|
-  participatory_space.engine = Decidim::ParticipatoryProcesses::Engine
-  participatory_space.admin_engine = Decidim::ParticipatoryProcesses::AdminEngine
   participatory_space.icon = "decidim/participatory_processes/icon.svg"
   participatory_space.model_class_name = "Decidim::ParticipatoryProcess"
 
+  participatory_space.context(:public) do |context|
+    context.engine = Decidim::ParticipatoryProcesses::Engine
+    context.layout = "layouts/decidim/participatory_process"
+    context.helper = "Decidim::ParticipatoryProcesses::ParticipatoryProcessHelper"
+  end
+
+  participatory_space.context(:admin) do |context|
+    context.engine = Decidim::ParticipatoryProcesses::AdminEngine
+    context.layout = "layouts/decidim/admin/participatory_process"
+  end
+
   participatory_space.seeds do
     organization = Decidim::Organization.first
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")

data/lib/decidim/participatory_processes/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.8.3"
+      "0.8.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-participatory_processes
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 description: Participatory Processes plugin for decidim
 email:
 - josepjaume@gmail.com
@@ -87,9 +87,6 @@ files:
 - app/commands/decidim/participatory_processes/admin/update_participatory_process_step.rb
 - app/constraints/decidim/participatory_processes/current_feature.rb
 - app/constraints/decidim/participatory_processes/current_participatory_process.rb
-- app/controllers/concerns/decidim/participatory_processes/admin/participatory_process_context.rb
-- app/controllers/concerns/decidim/participatory_processes/needs_participatory_process.rb
-- app/controllers/concerns/decidim/participatory_processes/participatory_process_context.rb
 - app/controllers/decidim/participatory_processes/admin/application_controller.rb
 - app/controllers/decidim/participatory_processes/admin/categories_controller.rb
 - app/controllers/decidim/participatory_processes/admin/concerns/participatory_process_admin.rb

data/app/controllers/concerns/decidim/participatory_processes/admin/participatory_process_context.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    module Admin
-      # This module, when injected into a controller, ensures there's a
-      # Participatory Process available and deducts it from the context.
-      module ParticipatoryProcessContext
-        def self.extended(base)
-          base.class_eval do
-            include Concerns::ParticipatoryProcessAdmin
-
-            delegate :active_step, to: :current_participatory_process, prefix: false
-
-            alias_method :current_participatory_process, :current_participatory_space
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    # This module, when injected into a controller, ensures there's a
-    # Participatory Process available and deducts it from the context.
-    module NeedsParticipatoryProcess
-      def self.enhance_controller(instance_or_module)
-        instance_or_module.class_eval do
-          helper_method :current_participatory_process
-        end
-      end
-
-      def self.extended(base)
-        base.extend Decidim::NeedsOrganization, InstanceMethods
-
-        enhance_controller(base)
-      end
-
-      def self.included(base)
-        base.include Decidim::NeedsOrganization, InstanceMethods
-
-        enhance_controller(base)
-      end
-
-      module InstanceMethods
-        # Public: Finds the current Participatory Process given this controller's
-        # context.
-        #
-        # Returns the current ParticipatoryProcess.
-        def current_participatory_process
-          @current_participatory_process ||= detect_participatory_process
-        end
-
-        alias current_participatory_space current_participatory_process
-
-        private
-
-        def ability_context
-          super.merge(current_participatory_process: current_participatory_process)
-        end
-
-        def detect_participatory_process
-          request.env["current_participatory_process"] ||
-            organization_processes.find_by!(slug: params[:participatory_process_slug] || params[:slug])
-        end
-
-        def organization_processes
-          @organization_processes ||= OrganizationParticipatoryProcesses.new(current_organization).query
-        end
-      end
-    end
-  end
-end

data/app/controllers/concerns/decidim/participatory_processes/participatory_process_context.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    # This module, when injected into a controller, ensures there's a
-    # Participatory Process available and deducts it from the context.
-    module ParticipatoryProcessContext
-      def self.extended(base)
-        base.class_eval do
-          include NeedsParticipatoryProcess
-
-          layout "layouts/decidim/participatory_process"
-
-          helper ParticipatoryProcessHelper
-
-          before_action do
-            authorize! :read, current_participatory_process
-          end
-        end
-      end
-
-      def ability_context
-        super.merge(current_participatory_process: current_participatory_process)
-      end
-    end
-  end
-end