decidim-core 0.15.2 → 0.16.0

data/app/services/decidim/log/diff_changeset_calculator.rb

@@ -127,7 +127,9 @@ module Decidim
                 end
         return label unless locale
 
-        locale_name = I18n.t("locale.name", locale: locale)
+        locale_name = I18n.t("locale.name", locale: locale) if I18n.available_locales.include?(locale.to_sym)
+        locale_name ||= locale
+
         "#{label} (#{locale_name})"
       end
     end

data/app/services/decidim/notification_generator.rb

@@ -12,14 +12,21 @@ module Decidim
     # event - A String with the name of the event.
     # event_class - A class that wraps the event.
     # resource - an instance of a class implementing the `Decidim::Resource` concern.
+    # followers - a collection of Users that receive the notification because
+    #   they're following it
+    # affected_users - a collection of Users that receive the notification because
+    #   they're affected by it
     # extra - a Hash with extra information for the event.
-    def initialize(event, event_class, resource, recipient_ids, extra)
+    # rubocop:disable Metrics/ParameterLists
+    def initialize(event, event_class, resource, followers, affected_users, extra)
       @event = event
       @event_class = event_class
       @resource = resource
-      @recipient_ids = recipient_ids
+      @followers = followers
+      @affected_users = affected_users
       @extra = extra
     end
+    # rubocop:enable Metrics/ParameterLists
 
     # Schedules a job for each recipient to create the notification. Returns `nil`
     # if the resource is not resource or if it is not present.
@@ -29,21 +36,26 @@ module Decidim
       return unless resource
       return unless event_class.types.include?(:notification)
 
-      recipient_ids.each do |recipient_id|
-        generate_notification_for(recipient_id)
+      followers.each do |recipient|
+        generate_notification_for(recipient, user_role: :follower) if ["all", "followed-only"].include?(recipient.notification_types)
+      end
+
+      affected_users.each do |recipient|
+        generate_notification_for(recipient, user_role: :affected_user) if ["all", "own-only"].include?(recipient.notification_types)
       end
     end
 
     private
 
-    attr_reader :event, :event_class, :resource, :recipient_ids, :extra
+    attr_reader :event, :event_class, :resource, :followers, :affected_users, :extra
 
-    def generate_notification_for(recipient_id)
+    def generate_notification_for(recipient, user_role:)
       NotificationGeneratorForRecipientJob.perform_later(
         event,
         event_class.name,
         resource,
-        recipient_id,
+        recipient,
+        user_role.to_s,
         extra
       )
     end

data/app/services/decidim/notification_generator_for_recipient.rb

@@ -11,13 +11,14 @@ module Decidim
     # event - A String with the name of the event.
     # event_class - The class that wraps the event, in order to decorate it.
     # resource - an instance of a class implementing the `Decidim::Resource` concern.
-    # recipient - the ID of the User that will receive the notification.
+    # recipient - the User that will receive the notification.
     # extra - a Hash with extra information to be included in the notification.
-    def initialize(event, event_class, resource, recipient_id, extra)
+    def initialize(event, event_class, resource, recipient, user_role, extra) # rubocop:disable Metrics/ParameterLists
       @event = event
       @event_class = event_class
       @resource = resource
-      @recipient_id = recipient_id
+      @recipient = recipient
+      @user_role = user_role
       @extra = extra
     end
 
@@ -42,14 +43,10 @@ module Decidim
         event_class: event_class,
         resource: resource,
         event_name: event,
-        extra: extra
+        extra: extra.merge(received_as: user_role)
       )
     end
 
-    attr_reader :event, :event_class, :resource, :recipient_id, :extra
-
-    def recipient
-      @recipient ||= User.find_by(id: recipient_id)
-    end
+    attr_reader :event, :event_class, :resource, :recipient, :user_role, :extra
   end
 end

data/app/services/decidim/open_data_exporter.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Public: It generates a ZIP file with Open Data CSV files ready
+  # to be uploaded somewhere so users can download an organization
+  # data.
+  class OpenDataExporter
+    attr_reader :organization, :path
+
+    # Public: Initializes the class.
+    #
+    # organization - The Organization to export the data from.
+    # path         - The String path where to write the zip file.
+    def initialize(organization, path)
+      @organization = organization
+      @path = File.expand_path path
+    end
+
+    def export
+      dirname = File.dirname(path)
+      FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+      File.open(path, "wb") { |file| file.write(data) }
+    end
+
+    private
+
+    def data
+      buffer = Zip::OutputStream.write_buffer do |out|
+        open_data_manifests.each do |export_manifest|
+          csv_data = data_for(export_manifest)
+          out.put_next_entry("#{organization.host}-open-data-#{export_manifest.name}.csv")
+          out.write csv_data.read
+        end
+      end
+
+      buffer.string
+    end
+
+    def data_for(export_manifest)
+      collection = components.where(manifest_name: export_manifest.component_manifest.name).find_each.flat_map do |component|
+        export_manifest.collection.call(component)
+      end
+
+      Decidim::Exporters::CSV.new(collection, export_manifest.serializer).export
+    end
+
+    def open_data_manifests
+      @open_data_manifests ||= Decidim.component_manifests.flat_map(&:export_manifests).select(&:include_in_open_data?)
+    end
+
+    def components
+      @components ||= organization.published_components
+    end
+  end
+end

data/app/uploaders/decidim/open_data_uploader.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class deals with uploading open data.
+  class OpenDataUploader < ApplicationUploader
+    protected
+
+    # Override the directory where uploaded files will be stored. We only want one copy of the Open Data
+    # export.
+    def store_dir
+      default_path = "uploads/open-data"
+
+      return File.join(Decidim.base_uploads_path, default_path) if Decidim.base_uploads_path.present?
+      default_path
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+<%= decidim_form_for(@form, url: amends_path, method: :post) do |form| %>
+  <%= form.hidden_field :amendable_gid %>
+  <%= form.hidden_field :amendable_type %>
+  <%= form.hidden_field :emendation_type %>
+
+  <%= form.fields_for :emendation_fields, form.object.emendation_fields do |emendation_form| %>
+    <% @form.amendable.attributes.each do |key, value| %>
+      <% key = key.to_sym %>
+      <% if @form.amendable.fields.include?(key) %>
+        <div class="field">
+          <%= emendation_form.form_field_for key %>
+        </div>
+      <% elsif @form.amendable.ignore_fields.include?(key) %>
+        <%= emendation_form.hidden_field key, value: emendation_ignored_field_value(key) %>
+      <% else %>
+        <%= emendation_form.hidden_field key, value: value %>
+      <% end %>
+    <% end %>
+  <% end %>
+
+  <% if current_organization.user_groups_enabled? && current_user.user_groups.verified.any? %>
+    <div class="field">
+      <%= user_group_select_field form, :user_group_id %>
+    </div>
+  <% end %>
+
+  <div class="actions">
+    <%= form.submit t("send", scope: "decidim.amendments.new"), class: "button expanded mt-s mb-none", data: { disable: true } %>
+  </div>
+<% end %>

data/app/views/decidim/amendments/_review_form.html.erb

@@ -0,0 +1,19 @@
+<%= decidim_form_for(@form, url: accept_amend_path(emendation.amendment), method: :patch) do |form| %>
+
+  <%= form.fields_for :emendation_fields, form.object.emendation_fields do |emendation_form| %>
+    <% @form.emendation.attributes.each do |key, value| %>
+      <% key = key.to_sym %>
+      <% if @form.emendation.fields.include?(key) %>
+        <div class="field">
+          <%= emendation_form.form_field_for key %>
+        </div>
+      <% else %>
+        <%= emendation_form.hidden_field key, value: value %>
+      <% end %>
+    <% end %>
+  <% end %>
+
+  <div class="actions">
+    <%= form.submit t("send", scope: "decidim.amendments.review"), class: "button expanded mt-s mb-none", data: { disable: true } %>
+  </div>
+<% end %>

data/app/views/decidim/amendments/new.html.erb

@@ -0,0 +1,29 @@
+<main class="wrapper">
+  <div class="row">
+    <div class="columns large-3">
+      <div class="m-bottom">
+        <%= link_to :back do %>
+          <%= icon "chevron-left", class: "icon--small" %>
+          <%= t("back", scope: "decidim.amendments.new") %>
+        <% end %>
+      </div>
+      <div class="section">
+        <p>
+          <%= t("help_text", scope: "decidim.amendments.new", model_name: amendable.model_name.human.downcase ) %>
+          <strong>
+            <%= amendable.title %>
+          </strong>
+        </p>
+      </div>
+    </div>
+    <div class="columns large-6">
+      <h2 class="section-heading"><%= t("heading", scope: "decidim.amendments.new") %></h2>
+      <div class="card">
+        <div class="card__content">
+          <%= render "form" %>
+        </div>
+      </div>
+    </div>
+    <div class="columns large-3"></div>
+  </div>
+</main>

data/app/views/decidim/amendments/review.html.erb

@@ -0,0 +1,33 @@
+<main class="wrapper">
+  <div class="row">
+    <div class="columns large-3">
+      <div class="m-bottom">
+        <%= link_to :back do %>
+          <%= icon "chevron-left", class: "icon--small" %>
+          <%= t("back", scope: "decidim.amendments.review") %>
+        <% end %>
+      </div>
+      <div class="section">
+        <p>
+          <%= t("help_text", scope: "decidim.amendments.review", model_name: emendation.amendable.model_name.human.downcase) %>
+
+          <strong>
+            <%= emendation.amendable.title %>
+          </strong>
+        </p>
+      </div>
+    </div>
+    <div class="columns large-6">
+      <h2 class="section-heading">
+        <%= t("heading", scope: "decidim.amendments.review") %>
+      </h2>
+
+      <div class="card">
+        <div class="card__content">
+          <%= render "review_form" %>
+        </div>
+      </div>
+    </div>
+    <div class="columns large-3"></div>
+  </div>
+</main>

data/app/views/decidim/devise/registrations/new.html.erb

@@ -19,6 +19,8 @@
     </div>
   </div>
 
+  <%= render "decidim/devise/shared/omniauth_buttons" %>
+
   <div class="row">
     <div class="columns large-6 medium-10 medium-centered">
 
@@ -89,8 +91,6 @@
       <% end %>
     </div>
   </div>
-
-  <%= render "decidim/devise/shared/omniauth_buttons" %>
 </div>
 </main>
 <%= render "decidim/devise/shared/newsletter_modal" %>

data/app/views/decidim/devise/sessions/new.html.erb

@@ -5,41 +5,54 @@
     <div class="row collapse">
       <div class="columns large-8 large-centered text-center page-title">
         <h1 class="heading1"><%= t("devise.sessions.new.sign_in") %></h1>
-        <p>
-          <%= t(".are_you_new?") %>
-          <%= link_to t(".register"), new_user_registration_path %>
-        </p>
+        <% if current_organization.sign_up_enabled? %>
+          <p>
+            <%= t(".are_you_new?") %>
+            <%= link_to t(".register"), new_user_registration_path %>
+          </p>
+        <% elsif current_organization.sign_in_enabled? %>
+          <p>
+            <%= t(".sign_up_disabled") %>
+          </p>
+        <% else %>
+          <p>
+            <%= t(".sign_in_disabled") %>
+          </p>
+        <% end %>
       </div>
     </div>
-    <div class="row">
-      <div class="columns large-6 medium-centered">
-        <div class="card">
-          <div class="card__content">
-            <%= decidim_form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
-              <div>
-                <div class="field">
-                  <%= f.email_field :email, autofocus: true %>
-                </div>
-                <div class="field">
-                  <%= f.password_field :password, autocomplete: "off" %>
-                </div>
-              </div>
-              <fieldset>
-                <% if devise_mapping.rememberable? %>
+    <%= render "decidim/devise/shared/omniauth_buttons" %>
+
+    <% if current_organization.sign_in_enabled? %>
+      <div class="row">
+        <div class="columns large-6 medium-centered">
+          <div class="card">
+            <div class="card__content">
+              <%= decidim_form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+                <div>
+                  <div class="field">
+                    <%= f.email_field :email, autofocus: true %>
+                  </div>
                   <div class="field">
-                    <%= f.check_box :remember_me %>
+                    <%= f.password_field :password, autocomplete: "off" %>
                   </div>
-                <% end %>
-              </fieldset>
-              <div class="actions">
-                <%= f.submit t("devise.sessions.new.sign_in"), class: "button expanded" %>
-              </div>
-            <% end %>
-            <%= render "decidim/devise/shared/links" %>
+                </div>
+                <fieldset>
+                  <% if devise_mapping.rememberable? %>
+                    <div class="field">
+                      <%= f.check_box :remember_me %>
+                    </div>
+                  <% end %>
+                </fieldset>
+                <div class="actions">
+                  <%= f.submit t("devise.sessions.new.sign_in"), class: "button expanded" %>
+                </div>
+              <% end %>
+              <%= render "decidim/devise/shared/links" %>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-    <%= render "decidim/devise/shared/omniauth_buttons" %>
+    <% end %>
   </div>
 </main>

data/app/views/decidim/devise/shared/_links.html.erb

@@ -1,10 +1,10 @@
-<%- if controller_name != "sessions" %>
+<%- if controller_name != "sessions" && resource_class != Decidim::UserGroup %>
   <p class="text-center">
     <%= link_to t("devise.shared.links.sign_in"), new_session_path(resource_name) %>
   </p>
 <% end -%>
 
-<%- if devise_mapping.registerable? && controller_name != "registrations" %>
+<%- if current_organization.sign_up_enabled? && devise_mapping.registerable? && controller_name != "registrations" %>
   <p class="text-center">
     <%= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name) %>
   </p>
@@ -16,7 +16,7 @@
   </p>
 <% end -%>
 
-<%- if devise_mapping.confirmable? && controller_name != "confirmations" %>
+<%- if current_organization.sign_up_enabled? && devise_mapping.confirmable? && controller_name != "confirmations" %>
   <p class="text-center">
     <%= link_to t("devise.shared.links.didn_t_receive_confirmation_instructions"), new_confirmation_path(resource_name) %>
   </p>

data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb

@@ -1,10 +1,7 @@
-<% if devise_mapping.omniauthable? && any_social_provider_enabled? %>
+<% if Devise.mappings[:user].omniauthable? && any_social_provider_enabled? %>
   <div class="row">
     <div class="columns large-4 mediumlarge-6 medium-8 medium-centered">
-      <span class="register__separator">
-        <span class="register__separator__text"><%= t(".or") %></span>
-      </span>
-      <%- resource_class.omniauth_providers.each do |provider| %>
+      <%- Decidim::User.omniauth_providers.each do |provider| %>
         <% if social_provider_enabled? provider %>
           <div class="social-register">
             <%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: "button button--social button--#{normalize_provider_name(provider)}" do %>
@@ -16,6 +13,11 @@
           </div>
         <% end %>
       <% end %>
+      <%- if current_organization.sign_in_enabled? %>
+        <span class="register__separator">
+          <span class="register__separator__text"><%= t(".or") %></span>
+        </span>
+      <%- end %>
     </div>
   </div>
 <% end %>

data/app/views/decidim/follows/update_button.js.erb

@@ -1,3 +1,3 @@
 var $followResource = $("#<%= dom_id(resource, :follow) %>");
 
-morphdom($followResource[0], "<%= j((cell "decidim/follow_button", resource, inline: @inline, context: { current_user: current_user }).to_s.strip.html_safe) %>");
+morphdom($followResource[0], "<%= j((cell "decidim/follow_button", resource, inline: @inline).to_s.strip.html_safe) %>");