🐛 Merge fix for CTA path #488

OpenSourcePolitics · Mar 13, 2019 · 4ce6f6c · 4ce6f6c
1 parent 6ae9cfa
commit 4ce6f6c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/...im-participatory_processes/app/cells/decidim/participatory_processes/process_m/footer.erb b/...im-participatory_processes/app/cells/decidim/participatory_processes/process_m/footer.erb
@@ -6,7 +6,7 @@
         <div class="text-ellipsis"><strong><%= step_title %></strong></div>
       </div>
     <% end %>
-    <%= link_to resource_path, class: "card__button button button--sc secondary light small" do %>
+    <%= link_to step_cta_path, class: "card__button button button--sc secondary light small" do %>
       <%= step_cta_text.presence || t("participatory_processes.promoted_process.take_part", scope: "layouts.decidim") %>
     <% end %>
   </div>

diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_m_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_m_cell.rb
@@ -45,6 +45,14 @@ def step_cta_text
         end
       end
 
+      def step_cta_path
+        if model.active_step&.cta_path.present?
+          model.active_step.cta_path
+        else
+          resource_path
+        end
+      end
+
       def step_title
         translated_attribute model.active_step.title
       end

diff --git a/.../views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb b/.../views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb
@@ -16,7 +16,12 @@
            style="background-image:url(<%= promoted_process.hero_image.url %>)">
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
-            <%= link_to participatory_process_path(promoted_process), class: "button expanded button--sc" do %>
+            <% if promoted_process.active_step&.cta_path.present? %>
+              <%= cta_link = participatory_process_path(promoted_process) + "/" + promoted_process.active_step.cta_path %>
+            <% else %>
+              <%= cta_link = participatory_process_path(promoted_process) %>
+            <% end %>
+            <%= link_to cta_link, class: "button expanded button--sc" do %>
               <% if translated_in_current_locale(promoted_process.active_step&.cta_text) %>
                 <%= translated_attribute(promoted_process.active_step.cta_text) %>
               <% else %>