Merge pull request #71 from gencat/feat/department_admin_improvement

Set area read only for department admin

Author: RubenBlazquez

.github/workflows/test.yml

@@ -80,7 +80,7 @@ jobs:
           command: bundle install --jobs 4 --retry 3 
 
       - name: Install imagemagcick
-        run: sudo apt-get install imagemagick
+        run: sudo apt-get update && sudo apt-get install imagemagick
 
       - name: Disable Spring
         run: echo "DISABLE_SPRING=1" >> $GITHUB_ENV

CHANGELOG.md

@@ -3,6 +3,9 @@ Following Semantic Versioning 2.
 
 ## next version:
 
+## 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.
+
 ## Version 0.9.0 (MINOR)
 - Upgrade Ruby to 3.2.9
 - Upgrade Decidim to v0.29

Gemfile.lock

@@ -181,7 +181,7 @@ GIT
 PATH
   remote: .
   specs:
-    decidim-department_admin (0.9.0)
+    decidim-department_admin (0.10.0)
       decidim-admin (~> 0.29.0)
       decidim-core (~> 0.29.0)
 
@@ -862,7 +862,7 @@ DEPENDENCIES
   web-console (~> 3.5)
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.2.9p265
 
 BUNDLED WITH
    2.7.2

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+Deface::Override.new(
+  virtual_path: "decidim/participatory_processes/admin/participatory_processes/_form",
+  name: "disable-area-id-select-in-participatory_processes-form",
+  replace: "erb[loud]:contains('form.areas_select :area_id')",
+  text: <<-ERB
+    <%= form.areas_select :area_id,
+          areas_for_select(current_organization),
+          { include_blank: t(".select_an_area"), selected: current_user.areas.first&.id },
+          { disabled: current_user.department_admin? } %>
+  ERB
+)
+
+Deface::Override.new(
+  virtual_path: "decidim/assemblies/admin/assemblies/_form",
+  name: "disable-area-id-select-in-assemblies-form",
+  replace: "erb[loud]:contains('form.areas_select :area_id')",
+  text: <<-ERB
+    <%= form.areas_select :area_id,
+          areas_for_select(current_organization),
+          { include_blank: t(".select_an_area"), selected: current_user.areas.first&.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.9.0"
+      "0.10.0"
     end
 
     DECIDIM_VER = "~> 0.29.0"

spec/system/department_admin_should_be_able_to_manage_assemblies_spec.rb

@@ -25,6 +25,16 @@
       click_on "New assembly"
     end
 
+    it "shows area field as disabled with department admin area pre-selected" do
+      within ".new_assembly" do
+        area_select = find("#assembly_area_id")
+
+        expect(area_select).to be_present
+        expect(area_select[:disabled]).to eq("true")
+        expect(area_select.value).to eq(area.id.to_s)
+      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

@@ -40,6 +40,16 @@
       click_on "New process"
     end
 
+    it "shows area field as disabled with department admin area pre-selected" 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("true")
+        expect(area_select.value).to eq(area.id.to_s)
+      end
+    end
+
     it "creates a new participatory process with department admin's area" do
       within ".new_participatory_process" do
         fill_in_i18n(