Merge pull request #72 from gencat/fix/department-admin-area

Fix area selection in participatory processes form

Author: RubenBlazquez

CHANGELOG.md

@@ -3,6 +3,9 @@ Following Semantic Versioning 2.
 
 ## next version:
 
+## Version 0.10.1 (PATCH)
+- Fix: Select the existing area_id by default when editing a participatory process if the logged user is an admin
+
 ## Version 0.10.0 (MINOR)
 - Changes in input area for processes and assemblies admin form. Now this input is setting by default with department admin area.
 

Gemfile.lock

@@ -181,7 +181,7 @@ GIT
 PATH
   remote: .
   specs:
-    decidim-department_admin (0.10.0)
+    decidim-department_admin (0.10.1)
       decidim-admin (~> 0.29.0)
       decidim-core (~> 0.29.0)
 

app/overrides/decidim/admin/shared/default_area_to_department_admin.rb

@@ -7,7 +7,7 @@
   text: <<-ERB
     <%= form.areas_select :area_id,
           areas_for_select(current_organization),
-          { include_blank: t(".select_an_area"), selected: current_user.areas.first&.id },
+          { include_blank: t(".select_an_area"), selected: current_user.department_admin? ? current_user.areas.first&.id : current_participatory_process.try(:decidim_area_id) },
           { disabled: current_user.department_admin? } %>
   ERB
 )
@@ -19,7 +19,7 @@
   text: <<-ERB
     <%= form.areas_select :area_id,
           areas_for_select(current_organization),
-          { include_blank: t(".select_an_area"), selected: current_user.areas.first&.id },
+          { include_blank: t(".select_an_area"), selected: current_user.department_admin? ? current_user.areas.first&.id : current_assembly.try(:decidim_area_id) },
           { disabled: current_user.department_admin? } %>
   ERB
 )

lib/decidim/department_admin/version.rb

@@ -5,7 +5,7 @@ module Decidim
   module DepartmentAdmin
     # see CHANGELOG.md
     def self.version
-      "0.10.0"
+      "0.10.1"
     end
 
     DECIDIM_VER = "~> 0.29.0"

spec/system/department_admin_should_be_able_to_manage_assemblies_spec.rb

@@ -35,6 +35,19 @@
       end
     end
 
+    context "when user is a regular admin" do
+      let(:department_admin) { create(:user, :admin, :confirmed, organization:) }
+
+      it "shows area field as enabled" do
+        within ".new_assembly" do
+          area_select = find("#assembly_area_id")
+
+          expect(area_select).to be_present
+          expect(area_select[:disabled]).to eq("false")
+        end
+      end
+    end
+
     it "creates a new assembly", :versioning do
       within ".new_assembly" do
         fill_in_i18n(:assembly_title, "#assembly-title-tabs", **attributes[:title].except("machine_translations"))

spec/system/department_admin_should_be_able_to_manage_processes_spec.rb

@@ -50,6 +50,19 @@
       end
     end
 
+    context "when user is a regular admin" do
+      let(:department_admin) { create(:user, :admin, :confirmed, organization:) }
+
+      it "shows area field as enabled" do
+        within ".new_participatory_process" do
+          area_select = find("#participatory_process_area_id")
+
+          expect(area_select).to be_present
+          expect(area_select[:disabled]).to eq("false")
+        end
+      end
+    end
+
     it "creates a new participatory process with department admin's area" do
       within ".new_participatory_process" do
         fill_in_i18n(