decidim-plans 0.16.4 → 0.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 741276c73f6d1054bf091d66981cb44f86587445f09f7a85ba2ff7cac995a1f1
-  data.tar.gz: c4fca20be4d12d149653fe12fd4cee859ada4833bac442b39a3968b7f64419f6
+  metadata.gz: '08d56d238a66eca983dbe996717bb9387525e974336ce65ab9f8943e1e3afe5e'
+  data.tar.gz: fe1204b85350bdea566562b75956c7eed3e989b793669b35b25be08b85cabe07
 SHA512:
-  metadata.gz: 6c9816cbe7feb9125c40f88c39430ab9a6d23cce821180e5088dc5aa382ddca815cc3f9c8f030a243c695e92c7a27a74a8f9ad9a5beb2a52d230992b3e053c7f
-  data.tar.gz: 67cf49151de0ee6d2415933531877fadae8ad50dbd16444ba8c4d7eddeae177f8084fadc9f6837524b3f42d1b4cac7ac995b14a9ee2d5eeb6a427d295d4bf8f0
+  metadata.gz: f8ac917fa65cc0f67ae41541ee8d9af242ecff01ed3b3936bba4f1dfe3b6de3d771dc830a6b9522596ab57a73d378b0ffe2be76454e9b96f530a3eb947144ed4
+  data.tar.gz: 17df9cff118e3dc9be17afb6408a247e600da2018cef3220078bf5885a0ebbc3da04780e14fe074935e4cbfc4966f379f4e37a6c035b65986002b1e5a4428a1a

data/app/assets/javascripts/decidim/plans/proposal_picker.js.es6

@@ -28,9 +28,9 @@ $(function() {
         renderItem: function (item, search) {
           let sanitizedSearch = search.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
           let re = new RegExp(`(${sanitizedSearch.split(" ").join("|")})`, "gi");
-          let title = item[0];
+          let title = item[0].replace(/"/g, """);
           let modelId = item[1];
-          return `<div class="autocomplete-suggestion" data-model-id="${modelId}" data-val ="${title}">${title.replace(re, "<b>$1</b>")}</div>`;
+          return `<div class="autocomplete-suggestion" data-model-id="${modelId}" data-val="${title}">${title.replace(re, "<b>$1</b>")}</div>`;
         },
         onSelect: function(event, term, item) {
           let choose = $("#proposal-picker-choose");

data/app/cells/decidim/plans/plan_cell.rb

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path
+        resource_locator(model).path + request_params_query
       end
 
       def current_participatory_space

data/app/cells/decidim/plans/plan_m_cell.rb

@@ -14,6 +14,10 @@ module Decidim
 
       private
 
+      def resource_path
+        resource_locator(model).path + request_params_query
+      end
+
       def title
         present(model).title
       end

data/app/commands/decidim/plans/admin/export_plans_to_budgets.rb

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when an admin exports plans to a
       # single budget component.
       class ExportPlansToBudgets < Rectify::Command
+        include ActionView::Helpers::TextHelper
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -35,7 +37,7 @@ module Decidim
               next if plan_already_copied?(original_plan, target_component)
 
               project = Decidim::Budgets::Project.new
-              project.title = original_plan.title
+              project.title = sanitize_localized(original_plan.title)
               project.description = project_description(original_plan)
               project.budget = form.default_budget
               project.category = original_plan.category
@@ -83,20 +85,13 @@ module Decidim
           original_plan.sections.each do |section|
             content = original_plan.contents.find_by(section: section)
             content.body.each do |locale, body_text|
-              title = section.body[locale]
+              title = sanitize(section.body[locale])
               pr_desc[locale] ||= ""
               pr_desc[locale] += "<h3>#{title}</h3>\n"
 
-              # In case the text is already HTML, append as is.
               # Wrap non-HTML strings within a <p> tag and replace newlines with
-              # <br>.
-              pr_desc[locale] += (
-                if body_text =~ %r{<\/?[^>]*>}
-                  "#{body_text}\n"
-                else
-                  "<p>#{body_text.gsub(/\n/, "<br>")}</p>\n"
-                end
-              )
+              # <br>. This also takes care of sanitization.
+              pr_desc[locale] += simple_format(body_text)
             end
           end
 
@@ -105,6 +100,12 @@ module Decidim
 
           pr_desc
         end
+
+        def sanitize_localized(hash)
+          hash.each do |locale, value|
+            hash[locale] = sanitize(value)
+          end
+        end
       end
     end
   end

data/app/controllers/decidim/plans/plans_controller.rb

@@ -160,22 +160,6 @@ module Decidim
         end
       end
 
-      def reopen
-        enforce_permission_to :close, :plan, plan: @plan
-
-        ReopenPlan.call(@plan, current_user) do
-          on(:ok) do |plan|
-            flash[:notice] = I18n.t("reopen.success", scope: "decidim.plans.plans.plan")
-            redirect_to Decidim::ResourceLocatorPresenter.new(plan).path
-          end
-
-          on(:invalid) do
-            flash.now[:alert] = t("reopen.error", scope: "decidim.plans.plans.plan")
-            redirect_to Decidim::ResourceLocatorPresenter.new(@plan).path
-          end
-        end
-      end
-
       private
 
       def check_draft

data/app/helpers/decidim/plans/application_helper.rb

@@ -5,6 +5,7 @@ module Decidim
     # Custom helpers, scoped to the plans engine.
     #
     module ApplicationHelper
+      include Decidim::Plans::LinksHelper
       include Decidim::Comments::CommentsHelper
       include PaginateHelper
       include Decidim::MapHelper

data/app/helpers/decidim/plans/links_helper.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Plans
+    module LinksHelper
+      # This is for generating the links so that they maintain the search status
+      def request_params(extra_params={}, exclude_params=[])
+        @request_params ||= request.params.except(
+          *(exclude_params + [
+            :action,
+            :component_id,
+            :controller,
+            :assembly_slug,
+            :participatory_process_slug,
+            :id
+          ])
+        ).merge(prepare_extra_params(extra_params))
+      end
+
+      def request_params_query(extra_params={}, exclude_params=[])
+        return "" unless request_params(extra_params, exclude_params).any?
+
+        "?#{request_params.to_query}"
+      end
+
+      private
+
+      # Adds the random seed to the extra parameters to maintain the ordering
+      # correctly across the requests.
+      def prepare_extra_params(extra_params)
+        return extra_params unless controller
+        return extra_params unless controller.respond_to?(:order, true)
+        return extra_params unless controller.respond_to?(:random_seed, true)
+
+        order = controller.send(:order)
+        return extra_params unless order == "random"
+
+        seed = controller.send(:random_seed)
+        return extra_params unless seed
+
+        extra_params.merge(random_seed: seed)
+      end
+    end
+  end
+end

data/app/presenters/concerns/decidim/plans/rich_presenter.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Plans
+    module RichPresenter
+      extend ActiveSupport::Concern
+      include ActionView::Helpers::TextHelper
+
+      def rich_content(content)
+        simple_format(content, wrapper_tag: nil)
+      end
+    end
+  end
+end

data/app/presenters/decidim/plans/content_presenter.rb

@@ -8,17 +8,18 @@ module Decidim
     class ContentPresenter < SimpleDelegator
       include Rails.application.routes.mounted_helpers
       include TranslatableAttributes
+      include Plans::RichPresenter
 
       def content
         __getobj__
       end
 
       def title
-        translated_attribute(content.title).html_safe
+        sanitize(translated_attribute(content.title))
       end
 
       def body
-        translated_attribute(content.body).html_safe
+        rich_content(translated_attribute(content.body))
       end
     end
   end

data/app/presenters/decidim/plans/plan_presenter.rb

@@ -9,6 +9,7 @@ module Decidim
       include Rails.application.routes.mounted_helpers
       include ActionView::Helpers::UrlHelper
       include TranslatableAttributes
+      include Plans::RichPresenter
 
       def author
         coauthorship = coauthorships.first
@@ -28,7 +29,7 @@ module Decidim
       end
 
       def title
-        translated_attribute(plan.title).html_safe
+        sanitize(translated_attribute(plan.title))
       end
 
       def body
@@ -36,9 +37,9 @@ module Decidim
           content = plan.contents.find_by(section: section)
           next if content.nil?
 
-          title = translated_attribute(content.title)
-          body = translated_attribute(content.body)
-          "<dt>#{title}</dt> <dd>#{body}</dd>"
+          section_title = sanitize(translated_attribute(content.title))
+          section_body = sanitize(translated_attribute(content.body))
+          "<dt>#{section_title}</dt> <dd>#{section_body}</dd>"
         end
 
         "<dl>#{fields.join("\n")}</dl>".html_safe

data/app/views/decidim/plans/admin/plans/_form.html.erb

@@ -23,12 +23,16 @@ form.multipart = true
     <div class="row column">
       <%= remaining_characters("plans_title", component_settings.plan_title_length) do |opts| %>
         <% if component_settings.multilingual_answers? %>
-          <%= form.translated :text_field, :title, opts.merge(tabs_id: "title-tabs") %>
+          <%= form.translated :text_field, :title, opts.merge(
+            tabs_id: "title-tabs",
+            help_text: translated_attribute(component_settings.title_help)
+          ) %>
         <% else %>
           <%= form.text_field(
             "title_#{current_locale}".to_sym,
             {
-              label: form.label_for(:title)
+              label: form.label_for(:title),
+              help_text: translated_attribute(component_settings.title_help)
             }.merge(opts)
           ) %>
         <% end %>

data/app/views/decidim/plans/plans/_contents.html.erb

@@ -1,6 +1,6 @@
 <div class="plan-contents">
   <% @plan.sections.each do |section| %>
-    <%= 
+    <%=
     render partial: "content",
     object: @plan.contents.find_by(section: section)
     %>

data/app/views/decidim/plans/plans/_form.html.erb

@@ -23,12 +23,15 @@ form.multipart = true
 <div class="field">
   <%= remaining_characters("plans_title", component_settings.plan_title_length) do |opts| %>
     <% if component_settings.multilingual_answers? %>
-      <%= form.translated :text_field, :title, opts %>
+      <%= form.translated :text_field, :title, opts.merge(
+        help_text: translated_attribute(component_settings.title_help)
+      ) %>
     <% else %>
       <%= form.text_field(
         "title_#{current_locale}".to_sym,
         {
-          label: form.label_for(:title)
+          label: form.label_for(:title),
+          help_text: translated_attribute(component_settings.title_help)
         }.merge(opts)
       ) %>
     <% end %>

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

@@ -12,10 +12,12 @@
 <% end %>
 
 <div class="row column view-header">
-  <%= link_to plans_path do %>
-    <%= icon "chevron-left", class: "icon--small" %>
-    <%= t(".back") %>
-  <% end %>
+  <p class="h5">
+    <%= link_to plans_path(request_params) do %>
+      <%= icon "chevron-left", class: "icon--small" %>
+      <%= t(".back") %>
+    <% end %>
+  </p>
 
   <h2 class="heading2">
     <%= present(@plan).title %>
@@ -45,12 +47,8 @@
         <% if allowed_to?(:edit, :plan, plan: @plan) %>
           <%= link_to t("edit", scope:"decidim.plans.plans.show"), edit_plan_path(@plan), class: "button secondary hollow expanded button--sc mt-s", id: "plan_edit" %>
         <% end %>
-        <% if allowed_to?(:close, :plan, plan: @plan) %>
-          <% if @plan.closed? %>
-            <%= link_to t("reopen", scope:"decidim.plans.plans.show"), reopen_plan_path(@plan), method: :post, class: "button secondary hollow expanded button--sc mt-s", id: "plan_reopen", data: { confirm: t("reopen_confirm", scope:"decidim.plans.plans.show") } %>
-          <% else %>
-            <%= link_to t("close", scope:"decidim.plans.plans.show"), close_plan_path(@plan), method: :post, class: "button secondary hollow expanded button--sc mt-s", id: "plan_close", data: { confirm: t("close_confirm", scope:"decidim.plans.plans.show") } %>
-          <% end %>
+        <% if allowed_to?(:close, :plan, plan: @plan) && !@plan.closed? %>
+          <%= link_to t("close", scope:"decidim.plans.plans.show"), close_plan_path(@plan), method: :post, class: "button secondary hollow expanded button--sc mt-s", id: "plan_close", data: { confirm: t("close_confirm", scope:"decidim.plans.plans.show") } %>
         <% end %>
 
         <%= render "request_access_form" %>

data/app/views/decidim/plans/shared/_attachment_fields.html.erb

@@ -1,3 +1,5 @@
+<% help_text = translated_attribute(component_settings.attachment_help).strip %>
+
 <div class="card multifield-field" id="<%= id %>-field">
   <div class="card-divider multifield-field-divider">
     <h3 class="heading6 card-title">
@@ -21,6 +23,10 @@
 
   <div class="card-section">
     <div class="row column">
+      <% if help_text && help_text.length > 0 %>
+        <p class="help-text"><%= help_text %></p>
+      <% end %>
+
       <div class="field">
         <% if form.send(:attribute_required?, :title) %>
           <%= form.text_field :title %>

data/config/locales/en.yml

@@ -34,6 +34,7 @@ en:
           global:
             announcement: Announcement
             attachments_allowed: Attachments allowed
+            attachment_help: Attachment help text
             categories_enabled: Categories enabled
             comments_enabled: Comments enabled
             multilingual_answers: Multilingual answers
@@ -41,6 +42,7 @@ en:
             plan_title_length: Title length
             proposal_linking_enabled: Proposal linking enabled
             scopes_enabled: Scopes enabled
+            title_help: Title help text
           step:
             announcement: Announcement
             comments_blocked: Comments blocked
@@ -330,57 +332,57 @@ en:
     events:
       plans:
         plan_access_accepted:
-          email_intro: '%{requester_name} has been accepted to access as a contributor of <a href="%{resource_path}">%{resource_title}</a>.'
-          email_outro: You have received this notification because you are a collaborator of <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: '%{requester_name} has been accepted to access as a contributor of <a href="%{resource_url}">%{resource_title}</a>.'
+          email_outro: You have received this notification because you are a collaborator of <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} has been accepted to access as a contributor of %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> has been <strong>accepted to access as a contributor</strong> of <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> has been <strong>accepted to access as a contributor</strong> of <a href="%{resource_url}">%{resource_title}</a>.
         plan_access_rejected:
-          email_intro: '%{requester_name} has been rejected to access as a contributor of <a href="%{resource_path}">%{resource_title}</a>.'
-          email_outro: You have received this notification because you are a collaborator of <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: '%{requester_name} has been rejected to access as a contributor of <a href="%{resource_url}">%{resource_title}</a>.'
+          email_outro: You have received this notification because you are a collaborator of <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} has been rejected to access as a contributor of %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> has been <strong>rejected to access as a contributor</strong> of <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> has been <strong>rejected to access as a contributor</strong> of <a href="%{resource_url}">%{resource_title}</a>.
         plan_access_requested:
-          email_intro: '%{requester_name} requested access as a contributor. You can <strong>accept or reject the request</strong> from the <a href="%{resource_path}">%{resource_title}</a> page.'
-          email_outro: You have received this notification because you are a collaborator of <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: '%{requester_name} requested access as a contributor. You can <strong>accept or reject the request</strong> from the <a href="%{resource_url}">%{resource_title}</a> page.'
+          email_outro: You have received this notification because you are a collaborator of <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} requested access to contribute to %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> requested access to contribute to <a href="%{resource_path}">%{resource_title}</a>. Please <strong>accept or reject the request</strong>.
+          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> requested access to contribute to <a href="%{resource_url}">%{resource_title}</a>. Please <strong>accept or reject the request</strong>.
         plan_access_requester_accepted:
-          email_intro: You have been accepted to access as a contributor of <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: You have received this notification because you requested to become a collaborator of <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: You have been accepted to access as a contributor of <a href="%{resource_url}">%{resource_title}</a>.
+          email_outro: You have received this notification because you requested to become a collaborator of <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: You have been accepted as a contributor of %{resource_title}.
-          notification_title: You have been <strong>accepted to access as a contributor</strong> of <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: You have been <strong>accepted to access as a contributor</strong> of <a href="%{resource_url}">%{resource_title}</a>.
         plan_access_requester_rejected:
-          email_intro: You have been rejected to access as a contributor of <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: You have received this notification because you requested to become a collaborator of <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: You have been rejected to access as a contributor of <a href="%{resource_url}">%{resource_title}</a>.
+          email_outro: You have received this notification because you requested to become a collaborator of <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: You have been rejected as a contributor of %{resource_title}.
-          notification_title: You have been <strong>rejected to access as a contributor</strong> of <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: You have been <strong>rejected to access as a contributor</strong> of <a href="%{resource_url}">%{resource_title}</a>.
         plan_accepted:
           email_intro: '"%{resource_title}" has been accepted. You can read the answer in this page:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
           email_subject: A resource you're following has been accepted
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> has been accepted.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> has been accepted.
         plan_evaluating:
           email_intro: '"%{resource_title}" is currently being evaluated. You can check for an answer in this page:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
           email_subject: A resource you're following is being evaluated
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> is being evaluated.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> is being evaluated.
         plan_published:
           email_intro: '"%{resource_title}" has been published. You can see it here:'
           email_outro: You have received this notification because you are following the author of "%{resource_title}". You can unfollow it from the previous link.
           email_subject: A user you're following has published a resource
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> has been published.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> has been published.
         plan_published_for_proposals:
           email_intro: 'A proposal you have authored has been linked to "%{resource_title}". You can see it here:'
           email_outro: You have received this notification because you are following "%{resource_title}" through the authored proposals. You can unfollow it from the previous link.
           email_subject: A proposal you have authored has been linked to new content
-          notification_title: A proposal you have authored has been linked to <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: A proposal you have authored has been linked to <a href="%{resource_url}">%{resource_title}</a>.
         plan_published_for_space:
           email_intro: '"%{resource_title}" has been published. You can see it here:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
           email_subject: A resource you're following has been published
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> has been published.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> has been published.
         plan_rejected:
           email_intro: '"%{resource_title}" has been rejected. You can read the answer in this page:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
           email_subject: A resource you're following has been rejected
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> has been rejected.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> has been rejected.

data/config/locales/fi.yml

@@ -323,57 +323,57 @@ fi:
     events:
       plans:
         plan_access_accepted:
-          email_intro: '%{requester_name} on annettu oikeus muokata sisältöä <a href="%{resource_path}">%{resource_title}</a> osallistujana.'
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistunut sisällön <a href="%{resource_path}">%{resource_title}</a> muokkaukseen.
+          email_intro: '%{requester_name} on annettu oikeus muokata sisältöä <a href="%{resource_url}">%{resource_title}</a> osallistujana.'
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistunut sisällön <a href="%{resource_url}">%{resource_title}</a> muokkaukseen.
           email_subject: "%{requester_name} on hyväksytty muokkaajaksi sisältöön %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> on <strong>hyväksytty muokkaajaksi</strong> sisältöön <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> on <strong>hyväksytty muokkaajaksi</strong> sisältöön <a href="%{resource_url}">%{resource_title}</a>.
         plan_access_rejected:
-          email_intro: 'Käyttäjän %{requester_name} muokkausoikeudet sisältöön <a href="%{resource_path}">%{resource_title} </a> on estetty.'
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistunut sisällön <a href="%{resource_path}">%{resource_title}</a> muokkaukseen.
+          email_intro: 'Käyttäjän %{requester_name} muokkausoikeudet sisältöön <a href="%{resource_url}">%{resource_title} </a> on estetty.'
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistunut sisällön <a href="%{resource_url}">%{resource_title}</a> muokkaukseen.
           email_subject: "%{requester_name} hakemus osallistua kohteen %{resource_title} muokkaukseen on hylätty."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> <strong>pyyntö muokata sisältöä on hylätty</strong> kohteelle <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> <strong>pyyntö muokata sisältöä on hylätty</strong> kohteelle <a href="%{resource_url}">%{resource_title}</a>.
         plan_access_requested:
-          email_intro: '%{requester_name} pyysi pääsyä osallistujaksi. Voit <strong>hyväksyä tai hylätä pyynnön</strong> sivulla <a href="%{resource_path}">%{resource_title}</a>.'
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistuja kohteessa <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: '%{requester_name} pyysi pääsyä osallistujaksi. Voit <strong>hyväksyä tai hylätä pyynnön</strong> sivulla <a href="%{resource_url}">%{resource_title}</a>.'
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistuja kohteessa <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} pyysi osallistumisoikeutta kohteeseen %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> pyysi saada muokata sisältöä <a href="%{resource_path}">%{resource_title}</a>. <strong>Hyväksy tai hylkää pyyntö</strong>.
+          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> pyysi saada muokata sisältöä <a href="%{resource_url}">%{resource_title}</a>. <strong>Hyväksy tai hylkää pyyntö</strong>.
         plan_access_requester_accepted:
-          email_intro: Sinut on hyväksytty osallistujaksi sisältöön <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet hakenut muokkausoikeuksia sisältöön <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: Sinut on hyväksytty osallistujaksi sisältöön <a href="%{resource_url}">%{resource_title}</a>.
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet hakenut muokkausoikeuksia sisältöön <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: Sinut on hyväksytty osallistujaksi sisältöön %{resource_title}.
-          notification_title: Sinut on <strong>hyväksytty osallistujaksi </strong> sisältöön <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Sinut on <strong>hyväksytty osallistujaksi </strong> sisältöön <a href="%{resource_url}">%{resource_title}</a>.
         plan_access_requester_rejected:
-          email_intro: Sinua ei ole hyväksytty osallistujaksi sisältöön <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet pyytänyt pääsyä osallistujaksi sisältöön <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: Sinua ei ole hyväksytty osallistujaksi sisältöön <a href="%{resource_url}">%{resource_title}</a>.
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet pyytänyt pääsyä osallistujaksi sisältöön <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: Sinua ei ole hyväksytty osallistujaksi sisältöön %{resource_title}.
-          notification_title: Sinua <strong>ei ole hyväksytty osallistujaksi</strong> sisältöön <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Sinua <strong>ei ole hyväksytty osallistujaksi</strong> sisältöön <a href="%{resource_url}">%{resource_title}</a>.
         plan_accepted:
           email_intro: '"%{resource_title}" on hyväksytty. Voit lukea vastauksen täältä:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{resource_title}". Voit lopettaa sen seuraamisen edellä esitetyn linkin kautta.
           email_subject: Seuraamasi kohde on hyväksytty
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> on hyväksytty.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> on hyväksytty.
         plan_evaluating:
           email_intro: '"%{resource_title}" arvioidaan parhaillaan. Voit tarkistaa vastauksen tältä sivulla:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{resource_title}". Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
           email_subject: Seuraamasi kohde on arvioitavana
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> on arvioitavana.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> on arvioitavana.
         plan_published:
           email_intro: '"%{resource_title}" on julkaistu. Näet sen täältä:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohteen "%{resource_title}" laatijaa. Voit lopettaa sen seuraamisen edellä esitetyn linkin kautta.
           email_subject: Seuraamasi käyttäjä on julkaissut uutta sisältöä
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> on julkaistu.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> on julkaistu.
         plan_published_for_proposals:
           email_intro: 'Laatimasi ehdotus on linkitetty kohteeseen "%{resource_title}". Näet sen täältä:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{resource_title}" laatimisesi ehdotusten kautta. Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
           email_subject: Laatimasi ehdotus on linkitetty uuteen sisältöön
-          notification_title: Laatimasi ehdotus on linkitetty kohteeseen <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Laatimasi ehdotus on linkitetty kohteeseen <a href="%{resource_url}">%{resource_title}</a>.
         plan_published_for_space:
           email_intro: '"%{resource_title}" on julkaistu. Näet sen täältä:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{resource_title}". Voit lopettaa sen seuraamisen edellä esitetyn linkin kautta.
           email_subject: Seuraamasi kohde on julkaistu
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> on julkaistu.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> on julkaistu.
         plan_rejected:
           email_intro: '"%{resource_title}" on hylätty. Voit lukea vastauksen tällä sivulla:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{resource_title}". Voit lopettaa sen seuraamisen edellä esitetyn linkin kautta.
           email_subject: Seuraamasi kohde on hylätty
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> on hylätty.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> on hylätty.