Don't show initiative state field instead of showing it disabled (dec…

…idim#11518) * Don't show initiative state field instead of showing it disabled * Don't show the field in the edit form neither * Add tests * Lint files * Update decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb Co-authored-by: Alexandru Emil Lupu <[email protected]> --------- Co-authored-by: Alexandru Emil Lupu <[email protected]>
Platoniq · Aug 24, 2023 · 295c7a1 · 295c7a1
1 parent 860418b
commit 295c7a1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb
@@ -81,10 +81,9 @@
           help_text: t("attachment_legend", scope: "decidim.initiatives.form") %>
     <% end %>
 
-    <%= f.select :state,
-                    Decidim::Initiative.states.keys.map { |state| [I18n.t(state, scope: "decidim.initiatives.admin_states"), state] },
-                    {},
-                    { disabled: !@form.state_updatable? } %>
+    <% if @form.state_updatable? %>
+      <%= f.select :state, Decidim::Initiative.states.keys.map { |state| [I18n.t(state, scope: "decidim.initiatives.admin_states"), state] }, {} %>
+    <% end %>
 
     <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
       <%= link_to :back, class: "button button__sm md:button__lg button__text-secondary" do %>

diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb
@@ -6,10 +6,9 @@
 
 <%= form.text_field :hashtag, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
 
-<%= form.select :state,
-                Decidim::Initiative.states.keys.map { |state| [I18n.t(state, scope: "decidim.initiatives.admin_states"), state] },
-                {},
-                { disabled: [email protected]_updatable? } %>
+<% if @form.state_updatable? %>
+  <%= form.select :state, Decidim::Initiative.states.keys.map { |state| [I18n.t(state, scope: "decidim.initiatives.admin_states"), state] }, {} %>
+<% end %>
 
 <% unless single_initiative_type? %>
   <%= form.select :type_id,
@@ -26,9 +25,7 @@
                   } %>
 <% end %>
 
-<%= form.select :scope_id,
-                @form.available_scopes.map { |scope| [translated_attribute(scope.scope_name), scope&.scope&.id] },
-                { disabled: [email protected]_updatable? } %>
+<%= form.select :scope_id, @form.available_scopes.map { |scope| [translated_attribute(scope.scope_name), scope.scope&.id] }, {}, { disabled: [email protected]_updatable? } %>
 
 <% if can_edit_custom_signature_end_date?(current_initiative) %>
   <%= form.date_field :signature_end_date, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>

diff --git a/decidim-initiatives/spec/system/create_initiative_spec.rb b/decidim-initiatives/spec/system/create_initiative_spec.rb
@@ -480,6 +480,10 @@
           expect(page).to have_xpath("//textarea[@id='initiative_description']", visible: :all)
         end
 
+        it "does not have status field" do
+          expect(page).not_to have_xpath("//select[@id='initiative_state']")
+        end
+
         it "offers contextual help" do
           within ".callout.secondary" do
             expect(page).to have_content("Review the content of your initiative.")
@@ -511,6 +515,10 @@
           expect(page).to have_xpath("//textarea[@id='initiative_description']", visible: :all)
         end
 
+        it "does not have status field" do
+          expect(page).not_to have_xpath("//select[@id='initiative_state']")
+        end
+
         it "offers contextual help" do
           within ".callout.secondary" do
             expect(page).to have_content("Review the content of your initiative.")

diff --git a/decidim-initiatives/spec/system/edit_initiative_spec.rb b/decidim-initiatives/spec/system/edit_initiative_spec.rb
@@ -52,6 +52,10 @@
       end
     end
 
+    it "does not have status field" do
+      expect(page).not_to have_xpath("//select[@id='initiative_state']")
+    end
+
     context "when initiative is published" do
       let(:initiative) { create(:initiative, author: user, scoped_type:, organization:) }