decidim-core 0.4.4 → 0.5.0

data/lib/decidim/core/version.rb

@@ -3,11 +3,15 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.4.4"
+    "0.5.0"
   end
 
   def self.rails_version
-    ["~> 5.1.1"]
+    ["~> 5.1.3"]
+  end
+
+  def self.faker_version
+    "~> 1.8.4"
   end
 
   def self.add_default_gemspec_properties(spec)

data/lib/decidim/faker/localized.rb

@@ -121,9 +121,9 @@ module Decidim
       #
       # Returns a Hash with a value for each locale.
       def self.literal(text)
-        I18n.available_locales.inject({}) do |result, locale|
+        Decidim.available_locales.inject({}) do |result, locale|
           result.update(locale => text)
-        end
+        end.with_indifferent_access
       end
 
       # Wrapps a text build by the block with some other text.o
@@ -148,13 +148,13 @@ module Decidim
 
       # nodoc
       def self.localized
-        I18n.available_locales.inject({}) do |result, locale|
+        Decidim.available_locales.inject({}) do |result, locale|
           text = ::Faker::Base.with_locale(locale) do
             yield
           end
 
           result.update(locale => text)
-        end
+        end.with_indifferent_access
       end
 
       private_class_method :localized

data/lib/decidim/filter_form_builder.rb

@@ -41,6 +41,13 @@ module Decidim
       end
     end
 
+    # Wrap the scopes select in a custom fieldset.
+    def scopes_select(method, options = {})
+      fieldset_wrapper options[:legend_title] do
+        super(method, options)
+      end
+    end
+
     private
 
     # Private: Renders a custom fieldset and execute the given block.

data/lib/decidim/form_builder.rb

@@ -42,18 +42,21 @@ module Decidim
         )
       end
 
+      tabs_id = options[:tabs_id] || "#{object_name}-#{name}-tabs"
+
       label_tabs = content_tag(:div, class: "label--tabs") do
         field_label = label_i18n(name, options[:label] || label_for(name))
 
         tabs_panels = "".html_safe
         if options[:label] != false
-          tabs_panels = content_tag(:ul, class: "tabs tabs--lang", id: "#{@object_name}-#{name}-tabs", data: { tabs: true }) do
+          tabs_panels = content_tag(:ul, class: "tabs tabs--lang", id: tabs_id, data: { tabs: true }) do
             locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
               string + content_tag(:li, class: tab_element_class_for("title", index)) do
                 title = I18n.with_locale(locale) { I18n.t("name", scope: "locale") }
                 element_class = nil
                 element_class = "is-tab-error" if error?(name_with_locale(name, locale))
-                content_tag(:a, title, href: "##{name}-panel-#{index}", class: element_class)
+                tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
+                content_tag(:a, title, href: "##{tab_content_id}", class: element_class)
               end
             end
           end
@@ -62,9 +65,10 @@ module Decidim
         safe_join [field_label, tabs_panels]
       end
 
-      tabs_content = content_tag(:div, class: "tabs-content", data: { tabs_content: "#{@object_name}-#{name}-tabs" }) do
+      tabs_content = content_tag(:div, class: "tabs-content", data: { tabs_content: tabs_id }) do
         locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
-          string + content_tag(:div, class: tab_element_class_for("panel", index), id: "#{name}-panel-#{index}") do
+          tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
+          string + content_tag(:div, class: tab_element_class_for("panel", index), id: tab_content_id) do
             send(type, name_with_locale(name, locale), options.merge(label: false))
           end
         end
@@ -122,8 +126,33 @@ module Decidim
                  else
                    []
                  end
+      html_options = {}
+
+      select(name, @template.options_for_select(categories, selected: selected, disabled: disabled), options, html_options)
+    end
+
+    # Public: Generates a select field with the scopes.
+    #
+    # name       - The name of the field (usually scope_id)
+    # collection - A collection of scopes.
+    # options    - An optional Hash with options:
+    # - prompt   - An optional String with the text to display as prompt.
+    #
+    # Returns a String.
+    def scopes_select(name, options = {})
+      selected = object.send(name)
+      if selected.present?
+        selected = [selected] unless selected.is_a?(Array)
+        scopes = Decidim::Scope.where(id: selected.map(&:to_i)).map { |scope| [scope.name[I18n.locale.to_s], scope.id] }
+      else
+        scopes = []
+      end
+      prompt = options.delete(:prompt)
+      remote_path = options.delete(:remote_path) || false
+      multiple = options.delete(:multiple) || false
+      html_options = { multiple: multiple, class: "select2", "data-remote-path" => remote_path, "data-placeholder" => prompt }
 
-      select(name, @template.options_for_select(categories, selected: selected, disabled: disabled), options)
+      select(name, @template.options_for_select(scopes, selected: selected), options, html_options)
     end
 
     # Public: Override so checkboxes are rendered before the label.

data/lib/decidim/scopable.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # This concern contains the logic related to scopes.
+  module Scopable
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :scope,
+                 foreign_key: "decidim_scope_id",
+                 class_name: "Decidim::Scope",
+                 optional: true
+    end
+
+    # Gets the children scopes of the object's scope.
+    #
+    # If it's global, returns the organization's top scopes.
+    #
+    # Returns an ActiveRecord::Relation.
+    def subscopes
+      scope ? scope.children : organization.top_scopes
+    end
+
+    # Whether the resource has subscopes or not.
+    #
+    # Returns a boolean.
+    def has_subscopes?
+      scopes_enabled && subscopes.any?
+    end
+  end
+end

data/lib/decidim/settings_manifest.rb

@@ -40,6 +40,7 @@ module Decidim
       @schema = Class.new do
         include Virtus.model
         include ActiveModel::Validations
+        include TranslatableAttributes
 
         cattr_accessor :manifest
 
@@ -56,8 +57,13 @@ module Decidim
         end
 
         manifest.attributes.each do |name, attribute|
-          attribute name, attribute.type_class, default: attribute.default_value
-          validates name, presence: true
+          if attribute.translated?
+            translatable_attribute name, attribute.type_class, default: attribute.default_value
+            validates name, translatable_presence: true
+          else
+            attribute name, attribute.type_class, default: attribute.default_value
+            validates name, presence: true
+          end
         end
       end
 
@@ -81,6 +87,8 @@ module Decidim
 
       attribute :type, Symbol, default: :boolean
       attribute :default
+      attribute :translated, Boolean, default: false
+      attribute :editor, Boolean, default: false
 
       validates :type, inclusion: { in: TYPES.keys }
 

data/lib/decidim/translatable_attributes.rb

@@ -29,7 +29,6 @@ module Decidim
 
         locales.each do |locale|
           attribute_name = "#{name}_#{locale}".gsub("-", "__")
-
           attribute attribute_name, type, *options
 
           define_method attribute_name do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: 5.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: 5.1.3
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -446,76 +446,90 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: select2-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: decidim-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -556,8 +570,11 @@ files:
 - app/assets/javascripts/decidim/form_filter.component.test.js
 - app/assets/javascripts/decidim/foundation.js.es6
 - app/assets/javascripts/decidim/history.js.es6
+- app/assets/javascripts/decidim/impersonation.js.es6
 - app/assets/javascripts/decidim/map.js.es6.erb
 - app/assets/javascripts/decidim/orders.js.es6
+- app/assets/javascripts/decidim/select2.field.js.es6
+- app/assets/javascripts/decidim/select2.js.es6
 - app/assets/javascripts/decidim/user_registrations.js.es6
 - app/assets/javascripts/decidim/widget.js.es6
 - app/assets/stylesheets/decidim/_decidim.scss
@@ -566,12 +583,15 @@ files:
 - app/assets/stylesheets/decidim/editor.sass
 - app/assets/stylesheets/decidim/email.css
 - app/assets/stylesheets/decidim/extras/_add_comments.scss
+- app/assets/stylesheets/decidim/extras/_announcement.scss
 - app/assets/stylesheets/decidim/extras/_callout.scss
 - app/assets/stylesheets/decidim/extras/_collection-sort-controls.scss
 - app/assets/stylesheets/decidim/extras/_embed.scss
+- app/assets/stylesheets/decidim/extras/_impersonation-bar.scss
 - app/assets/stylesheets/decidim/extras/_label-required.scss
 - app/assets/stylesheets/decidim/extras/_leaflet.scss
 - app/assets/stylesheets/decidim/extras/_process_stats.scss
+- app/assets/stylesheets/decidim/extras/_proposal_form.scss
 - app/assets/stylesheets/decidim/extras/_quill.scss
 - app/assets/stylesheets/decidim/extras/_reference.scss
 - app/assets/stylesheets/decidim/extras/_register_form.scss
@@ -626,6 +646,7 @@ files:
 - app/assets/stylesheets/decidim/modules/_typography.scss
 - app/assets/stylesheets/decidim/modules/_user-form.scss
 - app/assets/stylesheets/decidim/modules/_video.scss
+- app/assets/stylesheets/decidim/plugins/_select2.scss
 - app/assets/stylesheets/decidim/utils/_fontface.scss
 - app/assets/stylesheets/decidim/utils/_helpers.scss
 - app/assets/stylesheets/decidim/utils/_keyframes.scss
@@ -648,6 +669,7 @@ files:
 - app/controllers/concerns/decidim/devise_controllers.rb
 - app/controllers/concerns/decidim/filter_resource.rb
 - app/controllers/concerns/decidim/form_factory.rb
+- app/controllers/concerns/decidim/impersonate_users.rb
 - app/controllers/concerns/decidim/locale_switcher.rb
 - app/controllers/concerns/decidim/needs_authorization.rb
 - app/controllers/concerns/decidim/needs_organization.rb
@@ -677,9 +699,11 @@ files:
 - app/controllers/decidim/participatory_process_widgets_controller.rb
 - app/controllers/decidim/participatory_processes_controller.rb
 - app/controllers/decidim/reports_controller.rb
+- app/controllers/decidim/scopes_controller.rb
 - app/controllers/decidim/static_map_controller.rb
 - app/controllers/decidim/widgets_controller.rb
 - app/forms/decidim/account_form.rb
+- app/forms/decidim/attachment_form.rb
 - app/forms/decidim/delete_account_form.rb
 - app/forms/decidim/form.rb
 - app/forms/decidim/invite_user_form.rb
@@ -708,12 +732,12 @@ files:
 - app/helpers/decidim/meta_tags_helper.rb
 - app/helpers/decidim/omniauth_helper.rb
 - app/helpers/decidim/orders_helper.rb
-- app/helpers/decidim/organization_scopes_helper.rb
 - app/helpers/decidim/paginate_helper.rb
 - app/helpers/decidim/participatory_process_helper.rb
 - app/helpers/decidim/participatory_process_steps_helper.rb
 - app/helpers/decidim/replace_buttons_helper.rb
 - app/helpers/decidim/resource_helper.rb
+- app/helpers/decidim/scopes_helper.rb
 - app/helpers/decidim/translations_helper.rb
 - app/helpers/decidim/user_profile_helper.rb
 - app/helpers/decidim/widget_urls_helper.rb
@@ -732,6 +756,7 @@ files:
 - app/models/decidim/abilities/participatory_process_admin_ability.rb
 - app/models/decidim/abilities/participatory_process_collaborator_ability.rb
 - app/models/decidim/abilities/participatory_process_moderator_ability.rb
+- app/models/decidim/abilities/user_manager_ability.rb
 - app/models/decidim/application_record.rb
 - app/models/decidim/attachment.rb
 - app/models/decidim/authorization.rb
@@ -739,6 +764,7 @@ files:
 - app/models/decidim/category.rb
 - app/models/decidim/feature.rb
 - app/models/decidim/identity.rb
+- app/models/decidim/impersonation_log.rb
 - app/models/decidim/moderation.rb
 - app/models/decidim/newsletter.rb
 - app/models/decidim/organization.rb
@@ -749,6 +775,7 @@ files:
 - app/models/decidim/report.rb
 - app/models/decidim/resource_link.rb
 - app/models/decidim/scope.rb
+- app/models/decidim/scope_type.rb
 - app/models/decidim/static_page.rb
 - app/models/decidim/user.rb
 - app/models/decidim/user_group.rb
@@ -758,6 +785,7 @@ files:
 - app/presenters/decidim/menu_presenter.rb
 - app/presenters/decidim/participatory_process_stats_presenter.rb
 - app/presenters/decidim/resource_locator_presenter.rb
+- app/queries/decidim/freetext_scopes.rb
 - app/queries/decidim/highlighted_participatory_processes.rb
 - app/queries/decidim/organization_participatory_process_groups.rb
 - app/queries/decidim/organization_participatory_processes.rb
@@ -831,16 +859,21 @@ files:
 - app/views/decidim/reported_mailer/report.html.erb
 - app/views/decidim/shared/_action_authorization_modal.html.erb
 - app/views/decidim/shared/_address_details.html.erb
+- app/views/decidim/shared/_announcement.html.erb
 - app/views/decidim/shared/_comments.html.erb
 - app/views/decidim/shared/_embed_modal.html.erb
+- app/views/decidim/shared/_feature_announcement.html.erb
 - app/views/decidim/shared/_flag_modal.html.erb
 - app/views/decidim/shared/_login_modal.html.erb
 - app/views/decidim/shared/_orders.html.erb
 - app/views/decidim/shared/_results_per_page.html.erb
 - app/views/decidim/shared/_share_modal.html.erb
 - app/views/decidim/shared/_static_map.html.erb
+- app/views/decidim/shared/_tags.html.erb
 - app/views/decidim/widgets/show.js.erb
 - app/views/devise/mailer/confirmation_instructions.html.erb
+- app/views/devise/mailer/invitation_instructions.html.erb
+- app/views/devise/mailer/invitation_instructions.text.erb
 - app/views/devise/mailer/invite_admin.html.erb
 - app/views/devise/mailer/invite_admin.text.erb
 - app/views/devise/mailer/invite_collaborator.html.erb
@@ -860,6 +893,7 @@ files:
 - app/views/layouts/decidim/_cookie_warning.html.erb
 - app/views/layouts/decidim/_head.html.erb
 - app/views/layouts/decidim/_head_extra.html.erb
+- app/views/layouts/decidim/_impersonation_warning.html.erb
 - app/views/layouts/decidim/_language_chooser.html.erb
 - app/views/layouts/decidim/_logo.html.erb
 - app/views/layouts/decidim/_mailer_logo.html.erb
@@ -894,6 +928,7 @@ files:
 - config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/nl.yml
+- config/locales/pl.yml
 - config/routes.rb
 - config/secrets.yml
 - db/migrate/20160817115213_devise_create_decidim_users.rb
@@ -964,18 +999,25 @@ files:
 - db/migrate/20170405094258_change_decidim_identities_provider_uid_index_uniqueness.rb
 - db/migrate/20170529150743_add_rejected_at_to_user_groups.rb
 - db/migrate/20170605140421_add_deleted_fields_to_users.rb
+- db/migrate/20170605162500_add_hierarchy_to_scopes.rb
 - db/migrate/20170606102659_set_email_unique_in_organization_conditional.rb
 - db/migrate/20170608142521_add_organization_to_user_groups.rb
 - db/migrate/20170612070905_add_uniqueness_to_name_and_document_number_to_user_groups.rb
 - db/migrate/20170612100253_create_decidim_categorizations.rb
 - db/migrate/20170713131206_add_admin_to_users.rb
 - db/migrate/20170713131308_migrate_user_roles_to_participatory_process_roles.rb
+- db/migrate/20170720135441_add_managed_to_users.rb
+- db/migrate/20170720140610_set_email_unique_in_organization_condition_for_managed_users.rb
+- db/migrate/20170724130558_create_impersonation_logs.rb
 - db/migrate/20170725085104_add_show_statistics_to_participatory_processes.rb
+- db/migrate/20170727125445_add_roles_to_users.rb
+- db/migrate/20170804125402_attachment_description_nullable.rb
+- db/migrate/20170808080905_add_announcement_to_participatory_processes.rb
+- db/migrate/20170809084005_add_scopes_enabled_to_participatory_processes.rb
 - db/seeds.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
-- db/seeds/city3.jpeg
 - db/seeds/homepage_image.jpg
 - lib/decidim/abilities.rb
 - lib/decidim/abilities/participatory_process_role_ability.rb
@@ -997,6 +1039,7 @@ files:
 - lib/decidim/core/engine.rb
 - lib/decidim/core/test.rb
 - lib/decidim/core/test/factories.rb
+- lib/decidim/core/test/shared_examples/announcements_examples.rb
 - lib/decidim/core/test/shared_examples/authorable.rb
 - lib/decidim/core/test/shared_examples/comments_examples.rb
 - lib/decidim/core/test/shared_examples/errors.rb
@@ -1008,6 +1051,7 @@ files:
 - lib/decidim/core/test/shared_examples/localised_email.rb
 - lib/decidim/core/test/shared_examples/manage_moderations_examples.rb
 - lib/decidim/core/test/shared_examples/paginated_resource_examples.rb
+- lib/decidim/core/test/shared_examples/process_announcements_examples.rb
 - lib/decidim/core/test/shared_examples/publicable.rb
 - lib/decidim/core/test/shared_examples/reportable.rb
 - lib/decidim/core/test/shared_examples/reports_examples.rb
@@ -1046,12 +1090,12 @@ files:
 - lib/decidim/reportable.rb
 - lib/decidim/resource_manifest.rb
 - lib/decidim/resourceable.rb
+- lib/decidim/scopable.rb
 - lib/decidim/settings_manifest.rb
 - lib/decidim/stats_registry.rb
 - lib/decidim/translatable_attributes.rb
 - lib/devise/models/decidim_validatable.rb
 - lib/tasks/decidim_tasks.rake
-- lib/tasks/factory_girl.rake
 - vendor/assets/javascripts/appendAround.js
 - vendor/assets/javascripts/datepicker-locales/foundation-datepicker.ca.js
 - vendor/assets/javascripts/datepicker-locales/foundation-datepicker.es.js