decidim 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e284bf0abcdd90e9990217814e9c64ebe62ebcb2
-  data.tar.gz: c0f2fab85e3dfa389abb44b3c03309df82113f8c
+  metadata.gz: 7e8c6493fbd0cf1f5c25e29ca9437738e4869b50
+  data.tar.gz: 771d309025def8f3a500e4ba8078facc79731245
 SHA512:
-  metadata.gz: '09843fb003a0552d87748be32b469662e2bc15e159faa76c1f4a3e612f534be71f50301ecb95108959802f6d8215c26568455ca27d72d5275d47e5cee49ecf3f'
-  data.tar.gz: c886307891a5f01eb7e405aa3e14cc30533e3ad42b9a4e8dc9d053da31752b0c921afa50693d3f2159308e16f96f823b5a2ed03a3a8e0806aba9202572e1db2e
+  metadata.gz: 785a89832bf46e94da8a15f858a62f28edce44a5ba66041ec074ae298a855693730a4a82a9fd5d5e162ed3d8e3b63ca6cba8663689aa3785b5806a81978adab3
+  data.tar.gz: 77bc5c209524a36bf19ff3193b15b0913ed90ddde979f6f425739daea7e1e4c83b4efc479cf20949ee22e04bc89c8418b306db2ef997cdefa1ed207095aea531

data/.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: codegram/decidim:0.6.4
+      - image: codegram/decidim:0.6.5
         environment:
           SIMPLECOV: true
           DATABASE_USERNAME: postgres

data/CHANGELOG.md

@@ -1,8 +1,18 @@
 # Change Log
 
-## [Unreleased](https://github.com/decidim/decidim/tree/HEAD)
+## [v0.6.5](https://github.com/decidim/decidim/tree/v0.6.5) (2017-09-27)
+[Full Changelog](https://github.com/decidim/decidim/compare/v0.6.4...v0.6.5)
 
-## [v0.6.4](https://github.com/decidim/decidim/tree/v0.6.3) (2017-09-21)
+**Fixed**
+- **decidim-assemblies**: Embed pages were not working properly. Now we have tests to check they do [\#1929](https://github.com/decidim/decidim/pull/1929)
+- **decidim-core**: Fixes a bug with filter forms and URLs [\#1937](https://github.com/decidim/decidim/pull/1937)
+- **decidim-meetings**: Embed pages were not working properly. Now we have tests to check they do [\#1929](https://github.com/decidim/decidim/pull/1929)
+- **decidim-participatory-processes**: Embed pages were not working properly. Now we have tests to check they do [\#1929](https://github.com/decidim/decidim/pull/1929)
+- **decidim-proposals**: Embed pages were not working properly. Now we have tests to check they do [\#1929](https://github.com/decidim/decidim/pull/1929)
+- **decidim-results**: Embed pages were not working properly. Now we have tests to check they do [\#1929](https://github.com/decidim/decidim/pull/1929)
+- **decidim-surveys**: Questions could be created with missing translations. Errors were not showing on admin form. [\#1918](https://github.com/decidim/decidim/pull/1918)
+
+## [v0.6.4](https://github.com/decidim/decidim/tree/v0.6.4) (2017-09-21)
 [Full Changelog](https://github.com/decidim/decidim/compare/v0.6.3...v0.6.4)
 
 **Fixed**
@@ -17,7 +27,6 @@
 - **decidim-core**: On certain cases, authorizations controller was trying to redirect to an unexisting path. Fixed now. [\#1882](https://github.com/decidim/decidim/pull/1882)
 - **decidim-participatory-processes**: When visiting the process page on a multiple language organization and the URL had the deafult locale as a param, link to the resource itself was not being properly highlighted [\#1892](https://github.com/decidim/decidim/pull/1892)
 
-**Added**
 ## [v0.6.2](https://github.com/decidim/decidim/tree/v0.6.2) (2017-09-19)
 [Full Changelog](https://github.com/decidim/decidim/compare/v0.6.1...v0.6.2)
 

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    decidim (0.6.4)
-      decidim-admin (= 0.6.4)
-      decidim-api (= 0.6.4)
-      decidim-budgets (= 0.6.4)
-      decidim-comments (= 0.6.4)
-      decidim-core (= 0.6.4)
-      decidim-meetings (= 0.6.4)
-      decidim-pages (= 0.6.4)
-      decidim-participatory_processes (= 0.6.4)
-      decidim-proposals (= 0.6.4)
-      decidim-results (= 0.6.4)
-      decidim-surveys (= 0.6.4)
-      decidim-system (= 0.6.4)
-    decidim-admin (0.6.4)
+    decidim (0.6.5)
+      decidim-admin (= 0.6.5)
+      decidim-api (= 0.6.5)
+      decidim-budgets (= 0.6.5)
+      decidim-comments (= 0.6.5)
+      decidim-core (= 0.6.5)
+      decidim-meetings (= 0.6.5)
+      decidim-pages (= 0.6.5)
+      decidim-participatory_processes (= 0.6.5)
+      decidim-proposals (= 0.6.5)
+      decidim-results (= 0.6.5)
+      decidim-surveys (= 0.6.5)
+      decidim-system (= 0.6.5)
+    decidim-admin (0.6.5)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.6.4)
+      decidim-core (= 0.6.5)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -26,29 +26,29 @@ PATH
       rectify (~> 0.9.1)
       sassc-rails (~> 1.3.0)
       select2-rails (~> 4.0.3)
-    decidim-api (0.6.4)
+    decidim-api (0.6.5)
       graphiql-rails (~> 1.4.2)
       graphql (~> 1.6.0)
       rack-cors (~> 0.4.0)
       rails (~> 5.1.3)
       sprockets-es6 (~> 0.9.2)
-    decidim-budgets (0.6.4)
-      decidim-comments (= 0.6.4)
-      decidim-core (= 0.6.4)
+    decidim-budgets (0.6.5)
+      decidim-comments (= 0.6.5)
+      decidim-core (= 0.6.5)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.6.4)
-      decidim-core (= 0.6.4)
+    decidim-comments (0.6.5)
+      decidim-core (= 0.6.5)
       jquery-rails (~> 4.0)
       rails (~> 5.1.3)
-    decidim-core (0.6.4)
+    decidim-core (0.6.5)
       active_link_to (~> 1.0.4)
       autoprefixer-rails (~> 7.1.1)
       cancancan (~> 2.0.0)
       carrierwave (~> 1.1.0)
       date_validator (~> 0.9.0)
-      decidim-api (= 0.6.4)
+      decidim-api (= 0.6.5)
       devise (~> 4.3)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -76,39 +76,39 @@ PATH
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
       wisper (~> 2.0.0)
-    decidim-meetings (0.6.4)
+    decidim-meetings (0.6.5)
       date_validator (~> 0.9)
-      decidim-core (= 0.6.4)
+      decidim-core (= 0.6.5)
       httparty (~> 0.15.0)
       icalendar (~> 2.4.1)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-pages (0.6.4)
-      decidim-core (= 0.6.4)
+    decidim-pages (0.6.5)
+      decidim-core (= 0.6.5)
       rectify (~> 0.9.1)
-    decidim-participatory_processes (0.6.4)
-      decidim-core (= 0.6.4)
+    decidim-participatory_processes (0.6.5)
+      decidim-core (= 0.6.5)
       rails (~> 5.1.3)
-    decidim-proposals (0.6.4)
-      decidim-comments (= 0.6.4)
-      decidim-core (= 0.6.4)
+    decidim-proposals (0.6.5)
+      decidim-comments (= 0.6.5)
+      decidim-core (= 0.6.5)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       social-share-button (~> 0.10.0)
-    decidim-results (0.6.4)
-      decidim-comments (= 0.6.4)
-      decidim-core (= 0.6.4)
+    decidim-results (0.6.5)
+      decidim-comments (= 0.6.5)
+      decidim-core (= 0.6.5)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-surveys (0.6.4)
-      decidim-core (= 0.6.4)
+    decidim-surveys (0.6.5)
+      decidim-core (= 0.6.5)
       jquery-tmpl-rails (~> 1.1.0)
-    decidim-system (0.6.4)
+    decidim-system (0.6.5)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.6.4)
+      decidim-core (= 0.6.5)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.1)
@@ -121,14 +121,14 @@ PATH
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.6.4)
+    decidim-dev (0.6.5)
       byebug
       capybara (~> 2.15.0)
       capybara-screenshot (~> 1.0.14)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.6.0)
       db-query-matchers (~> 0.9.0)
-      decidim (= 0.6.4)
+      decidim (= 0.6.5)
       factory_girl_rails
       faker (~> 1.8.4)
       i18n-tasks (= 0.9.18)

data/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb

@@ -4,6 +4,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
   participatory_space.engine = Decidim::Assemblies::Engine
   participatory_space.admin_engine = Decidim::Assemblies::AdminEngine
   participatory_space.icon = "decidim/assemblies/icon.svg"
+  participatory_space.model_class_name = "Decidim::Assembly"
 
   participatory_space.seeds do
     organization = Decidim::Organization.first

data/decidim-assemblies/spec/features/assembly_embeds_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Assembly embeds", type: :feature do
+  let!(:assembly) { create(:assembly) }
+
+  context "when visiting the embed page for an assembly" do
+    before do
+      switch_to_host(assembly.organization.host)
+      visit resource_locator(assembly).path
+      visit "#{current_path}/embed"
+    end
+
+    it "renders the page correctly" do
+      expect(page).to have_i18n_content(assembly.title)
+      expect(page).to have_content(assembly.organization.name)
+    end
+  end
+end

data/decidim-core/app/controllers/decidim/widgets_controller.rb

@@ -5,6 +5,7 @@ module Decidim
     skip_authorization_check only: :show
     skip_before_action :verify_authenticity_token
     after_action :allow_iframe, only: :show
+    helper ResourceHelper
 
     layout "decidim/widget"
 

data/decidim-core/app/helpers/decidim/decidim_form_helper.rb

@@ -83,8 +83,10 @@ module Decidim
             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 form_field_has_error?(options[:object], name_with_locale(name, locale))
                 tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
-                content_tag(:a, title, href: "##{tab_content_id}")
+                content_tag(:a, title, href: "##{tab_content_id}", class: element_class)
               end
             end
           end
@@ -116,5 +118,9 @@ module Decidim
     def name_with_locale(name, locale)
       "#{name}_#{locale.to_s.gsub("-", "__")}"
     end
+
+    def form_field_has_error?(object, attribute)
+      object.respond_to?(:errors) && object.errors[attribute].present?
+    end
   end
 end

data/decidim-core/app/presenters/decidim/resource_locator_presenter.rb

@@ -7,6 +7,8 @@ module Decidim
       @resource = resource
     end
 
+    attr_reader :resource
+
     # Builds the path to the resource. Useful when linking to a resource from
     # another engine.
     #
@@ -24,7 +26,7 @@ module Decidim
     #
     # Returns a String.
     def url(options = {})
-      member_route("url", options.merge(host: @resource.organization.host))
+      member_route("url", options.merge(host: resource.organization.host))
     end
 
     # Builds the index path to the associated collection of resources.
@@ -42,7 +44,7 @@ module Decidim
     #
     # Returns a String.
     def member_route(route_type, options)
-      route_proxy.send("#{member_route_name}_#{route_type}", @resource, options)
+      route_proxy.send("#{member_route_name}_#{route_type}", resource, options)
     end
 
     # Private: Build the route to the associated collection of resources.
@@ -53,11 +55,12 @@ module Decidim
     end
 
     def manifest
-      @resource.class.resource_manifest
+      resource.class.try(:resource_manifest) ||
+        resource.class.try(:participatory_space_manifest)
     end
 
     def feature
-      @resource.feature
+      resource.feature if resource.respond_to?(:feature)
     end
 
     def member_route_name
@@ -69,7 +72,7 @@ module Decidim
     end
 
     def route_proxy
-      @route_proxy ||= EngineRouter.main_proxy(feature)
+      @route_proxy ||= EngineRouter.main_proxy(feature || resource)
     end
   end
 end

data/decidim-core/app/services/decidim/resource_search.rb

@@ -39,7 +39,11 @@ module Decidim
     # `"global"` as parameter, and in the method we do the needed changes to search
     # properly.
     def search_scope_id
-      clean_scope_ids = [scope_id].flatten
+      clean_scope_ids = if scope_id.is_a?(Hash)
+                          scope_id.values
+                        else
+                          [scope_id].flatten
+                        end
 
       conditions = []
       conditions << "decidim_scope_id IS NULL" if clean_scope_ids.delete("global")

data/decidim-core/app/views/layouts/decidim/widget.html.erb

@@ -13,7 +13,7 @@
       <%= content_for(:header) %>
     <% else %>
       <div class="participatory-process">
-        <%= link_to translated_attribute(current_participatory_space.title), polymorphic_path(current_participatory_space), target: "_blank" %>
+        <%= link_to translated_attribute(current_participatory_space.title), resource_locator(current_participatory_space).path, target: "_blank" %>
       </div>
     <% end %>
     <div class="row collapse">

data/decidim-core/lib/decidim/core/version.rb

@@ -3,7 +3,7 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.6.4"
+    "0.6.5"
   end
 
   def self.rails_version

data/decidim-core/lib/decidim/form_builder.rb

@@ -142,6 +142,7 @@ module Decidim
     def scopes_select(name, options = {})
       selected = object.send(name)
       if selected.present?
+        selected = selected.values if selected.is_a?(Hash)
         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

data/decidim-core/lib/decidim/participatory_space_manifest.rb

@@ -17,6 +17,13 @@ module Decidim
 
     attribute :name, Symbol
 
+    # The ActiveRecord class name of the model we're exposing
+    attribute :model_class_name, String
+
+    # The name of the named Rails route to create the url to the resource.
+    # When not explicitly set, it will use the model name.
+    attribute :route_name, String
+
     # A String with the feature's icon. The icon must be stored in the
     # engine's assets path.
     attribute :icon, String
@@ -36,5 +43,12 @@ module Decidim
     def seed!
       @seeds&.call
     end
+
+    # The name of the named Rails route to create the url to the resource.
+    #
+    # Returns a String.
+    def route_name
+      super || model_class_name.demodulize.underscore
+    end
   end
 end

data/decidim-core/spec/presenters/decidim/resource_locator_presenter_spec.rb

@@ -18,16 +18,32 @@ module Decidim
       create(:dummy_resource, id: 1, feature: feature)
     end
 
-    describe "#url" do
-      subject { described_class.new(resource).url }
+    context "with a feature resource" do
+      describe "#url" do
+        subject { described_class.new(resource).url }
 
-      it { is_expected.to eq("http://1.lvh.me/processes/1/f/1/dummy_resources/1") }
+        it { is_expected.to eq("http://1.lvh.me/processes/1/f/1/dummy_resources/1") }
+      end
+
+      describe "#path" do
+        subject { described_class.new(resource).path }
+
+        it { is_expected.to eq("/processes/1/f/1/dummy_resources/1") }
+      end
     end
 
-    describe "#path" do
-      subject { described_class.new(resource).path }
+    context "with a participatory_space" do
+      describe "#url" do
+        subject { described_class.new(participatory_process).url }
+
+        it { is_expected.to start_with("http://1.lvh.me/processes/1") }
+      end
+
+      describe "#path" do
+        subject { described_class.new(participatory_process).path }
 
-      it { is_expected.to eq("/processes/1/f/1/dummy_resources/1") }
+        it { is_expected.to start_with("/processes/1") }
+      end
     end
   end
 end

data/decidim-dev/lib/decidim/dev/test/rspec_support/feature_context.rb

@@ -11,10 +11,12 @@ shared_context "feature" do
     create(:participatory_process, :with_steps, organization: organization)
   end
 
+  let(:participatory_space) { participatory_process }
+
   let!(:feature) do
     create(:feature,
            manifest: manifest,
-           participatory_space: participatory_process)
+           participatory_space: participatory_space)
   end
 
   let!(:category) { create :category, participatory_space: participatory_process }

data/decidim-meetings/decidim-meetings.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-admin", Decidim.version
   s.add_development_dependency "decidim-participatory_processes", Decidim.version
+  s.add_development_dependency "decidim-assemblies", Decidim.version
   s.add_development_dependency "decidim-proposals", Decidim.version
   s.add_development_dependency "decidim-results", Decidim.version
 end

data/decidim-meetings/spec/factories.rb

@@ -2,6 +2,7 @@
 
 require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
+require "decidim/assemblies/test/factories"
 require "decidim/proposals/test/factories"
 require "decidim/results/test/factories"
 require "decidim/comments/test/factories"

data/decidim-meetings/spec/features/meeting_embeds_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Meeting embeds", type: :feature do
+  include_context "feature"
+  let(:manifest_name) { "meetings" }
+
+  let!(:meeting) { create(:meeting, feature: feature) }
+
+  context "when visiting the embed page for a meeting" do
+    before do
+      visit resource_locator(meeting).path
+      visit "#{current_path}/embed"
+    end
+
+    it "renders the page correctly" do
+      expect(page).to have_i18n_content(meeting.title)
+      expect(page).to have_content(organization.name)
+    end
+
+    context "when the participatory_space is a process" do
+      it "shows the process name" do
+        expect(page).to have_i18n_content(participatory_process.title)
+      end
+    end
+
+    context "when the participatory_space is an assembly" do
+      let(:assembly) do
+        create(:assembly, organization: organization)
+      end
+      let(:participatory_space) { assembly }
+
+      it "shows the assembly name" do
+        expect(page).to have_i18n_content(assembly.title)
+      end
+    end
+  end
+end

data/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb

@@ -4,6 +4,7 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
   participatory_space.engine = Decidim::ParticipatoryProcesses::Engine
   participatory_space.admin_engine = Decidim::ParticipatoryProcesses::AdminEngine
   participatory_space.icon = "decidim/participatory_processes/icon.svg"
+  participatory_space.model_class_name = "Decidim::ParticipatoryProcess"
 
   participatory_space.seeds do
     organization = Decidim::Organization.first

data/decidim-participatory_processes/spec/features/process_embeds_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Process embeds", type: :feature do
+  let!(:process) { create(:participatory_process) }
+
+  context "when visiting the embed page for a process" do
+    before do
+      switch_to_host(process.organization.host)
+      visit resource_locator(process).path
+      visit "#{current_path}/embed"
+    end
+
+    it "renders the page correctly" do
+      expect(page).to have_i18n_content(process.title)
+      expect(page).to have_content(process.organization.name)
+    end
+  end
+end

data/decidim-proposals/decidim-proposals.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-admin", Decidim.version
   s.add_development_dependency "decidim-participatory_processes", Decidim.version
+  s.add_development_dependency "decidim-assemblies", Decidim.version
   s.add_development_dependency "decidim-meetings", Decidim.version
   s.add_development_dependency "decidim-results", Decidim.version
   s.add_development_dependency "decidim-budgets", Decidim.version

data/decidim-proposals/spec/factories.rb

@@ -2,6 +2,7 @@
 
 require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
+require "decidim/assemblies/test/factories"
 require "decidim/comments/test/factories"
 require "decidim/meetings/test/factories"
 require "decidim/results/test/factories"

data/decidim-proposals/spec/features/proposal_embeds_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Proposal embeds", type: :feature do
+  include_context "feature"
+  let(:manifest_name) { "proposals" }
+
+  let!(:proposal) { create(:proposal, feature: feature) }
+
+  context "when visiting the embed page for a proposal" do
+    before do
+      visit resource_locator(proposal).path
+      visit "#{current_path}/embed"
+    end
+
+    it "renders the page correctly" do
+      expect(page).to have_content(proposal.title)
+      expect(page).to have_content(organization.name)
+    end
+
+    context "when the participatory_space is a process" do
+      it "shows the process name" do
+        expect(page).to have_i18n_content(participatory_process.title)
+      end
+    end
+
+    context "when the participatory_space is an assembly" do
+      let(:assembly) do
+        create(:assembly, organization: organization)
+      end
+      let(:participatory_space) { assembly }
+
+      it "shows the assembly name" do
+        expect(page).to have_i18n_content(assembly.title)
+      end
+    end
+  end
+end

data/decidim-results/decidim-results.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-admin", Decidim.version
   s.add_development_dependency "decidim-participatory_processes", Decidim.version
+  s.add_development_dependency "decidim-assemblies", Decidim.version
   s.add_development_dependency "decidim-comments", Decidim.version
   s.add_development_dependency "decidim-proposals", Decidim.version
   s.add_development_dependency "decidim-meetings", Decidim.version

data/decidim-results/spec/factories.rb

@@ -2,6 +2,7 @@
 
 require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
+require "decidim/assemblies/test/factories"
 require "decidim/comments/test/factories"
 require "decidim/proposals/test/factories"
 require "decidim/meetings/test/factories"

data/decidim-results/spec/features/result_embeds_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Result embeds", type: :feature do
+  include_context "feature"
+  let(:manifest_name) { "results" }
+
+  let!(:result) { create(:result, feature: feature) }
+
+  context "when visiting the embed page for a result" do
+    before do
+      visit resource_locator(result).path
+      visit "#{current_path}/embed"
+    end
+
+    it "renders the page correctly" do
+      expect(page).to have_i18n_content(result.title)
+      expect(page).to have_content(organization.name)
+    end
+
+    context "when the participatory_space is a process" do
+      it "shows the process name" do
+        expect(page).to have_i18n_content(participatory_process.title)
+      end
+    end
+
+    context "when the participatory_space is an assembly" do
+      let(:assembly) do
+        create(:assembly, organization: organization)
+      end
+      let(:participatory_space) { assembly }
+
+      it "shows the assembly name" do
+        expect(page).to have_i18n_content(assembly.title)
+      end
+    end
+  end
+end

data/decidim-surveys/app/forms/decidim/surveys/admin/survey_form.rb

@@ -13,6 +13,8 @@ module Decidim
         attribute :published_at, DateTime
 
         attribute :questions, Array[SurveyQuestionForm]
+
+        validates :title, translatable_presence: true
       end
     end
   end

data/decidim-surveys/app/forms/decidim/surveys/admin/survey_question_form.rb

@@ -18,6 +18,7 @@ module Decidim
 
         validates :position, numericality: { greater_than_or_equal_to: 0 }
         validates :question_type, inclusion: { in: SurveyQuestion::TYPES }
+        validates :body, translatable_presence: true, unless: :deleted
       end
     end
   end

data/decidim-surveys/app/views/decidim/surveys/admin/surveys/_question.html.erb

@@ -22,7 +22,8 @@
           :text_field_tag,
           "survey[questions][]",
           "body",
-          question.body,
+          question.body.with_indifferent_access,
+          object: question,
           tabs_id: tabs_id_for_question(question),
           label: t('.statement'),
           disabled: disabled_for_question(survey, question),

data/decidim-surveys/spec/commands/decidim/surveys/admin/update_survey_spec.rb

@@ -13,6 +13,11 @@ module Decidim
         let(:published_at) { nil }
         let(:form_params) do
           {
+            "title" => {
+              "en" => "Title",
+              "ca" => "Title",
+              "es" => "Title"
+            },
             "description" => {
               "en" => "<p>Content</p>",
               "ca" => "<p>Contingut</p>",
@@ -121,6 +126,16 @@ module Decidim
           context "and the question should be removed" do
             let(:form_params) do
               {
+                "title" => {
+                  "en" => "Title",
+                  "ca" => "Title",
+                  "es" => "Title"
+                },
+                "description" => {
+                  "en" => "<p>Content</p>",
+                  "ca" => "<p>Contingut</p>",
+                  "es" => "<p>Contenido</p>"
+                },
                 "questions" => [
                   {
                     "id" => survey_question.id,

data/decidim-surveys/spec/forms/decidim/surveys/admin/survey_form_spec.rb

@@ -8,6 +8,14 @@ module Decidim
       describe SurveyForm do
         let(:current_organization) { create(:organization) }
 
+        let(:title) do
+          {
+            "en" => "Title",
+            "ca" => "Title",
+            "es" => "Title"
+          }
+        end
+
         let(:description) do
           {
             "en" => "<p>Content</p>",
@@ -16,11 +24,13 @@ module Decidim
           }
         end
 
+        let(:body_english) { "First question" }
+
         let(:questions) do
           [
             {
               body: {
-                "en" => "First question",
+                "en" => body_english,
                 "ca" => "Primera pregunta",
                 "es" => "Primera pregunta"
               },
@@ -43,6 +53,7 @@ module Decidim
         let(:attributes) do
           {
             "survey" => {
+              "title" => title,
               "description" => description,
               "questions" => questions
             }
@@ -58,6 +69,12 @@ module Decidim
         context "when everything is OK" do
           it { is_expected.to be_valid }
         end
+
+        context "when a question is not valid" do
+          let(:body_english) { "" }
+
+          it { is_expected.not_to be_valid }
+        end
       end
     end
   end

data/decidim-surveys/spec/forms/decidim/surveys/admin/survey_question_form_spec.rb

@@ -9,10 +9,21 @@ module Decidim
         let!(:survey) { create(:survey) }
         let!(:position) { 0 }
         let!(:question_type) { SurveyQuestion::TYPES.first }
-        let!(:survey_question) { build(:survey_question, survey: survey, position: position, question_type: question_type) }
+        let!(:organization) { create :organization }
+        let(:deleted) { "false" }
+        let(:attributes) do
+          {
+            body_en: "Body en",
+            body_ca: "Body ca",
+            body_es: "Body es",
+            question_type: question_type,
+            position: position,
+            deleted: deleted
+          }
+        end
 
         subject do
-          described_class.from_model(survey_question).with_context(current_feature: survey.feature)
+          described_class.from_params(attributes).with_context(current_feature: survey.feature, current_organization: organization)
         end
 
         context "when everything is OK" do
@@ -30,6 +41,24 @@ module Decidim
 
           it { is_expected.not_to be_valid }
         end
+
+        context "when the body is missing a locale translation" do
+          before do
+            attributes[:body_en] = ""
+          end
+
+          context "when the question is not deleted" do
+            let(:deleted) { "false" }
+
+            it { is_expected.not_to be_valid }
+          end
+
+          context "when the question is deleted" do
+            let(:deleted) { "true" }
+
+            it { is_expected.to be_valid }
+          end
+        end
       end
     end
   end

data/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -4726,15 +4726,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -4745,6 +4736,15 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -9063,15 +9063,6 @@
         "xtend": "4.0.1"
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-length": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
@@ -9110,6 +9101,15 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,168 +18,168 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-surveys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -698,6 +698,7 @@ files:
 - decidim-assemblies/spec/features/admin/admin_manages_assembly_feature_permissions_spec.rb
 - decidim-assemblies/spec/features/admin/admin_manages_assembly_features_spec.rb
 - decidim-assemblies/spec/features/assemblies_spec.rb
+- decidim-assemblies/spec/features/assembly_embeds_spec.rb
 - decidim-assemblies/spec/forms/assembly_form_spec.rb
 - decidim-assemblies/spec/forms/category_form_spec.rb
 - decidim-assemblies/spec/helpers/decidim/scopes_helper_spec.rb
@@ -1800,6 +1801,7 @@ files:
 - decidim-meetings/spec/features/comments_spec.rb
 - decidim-meetings/spec/features/explore_meetings_spec.rb
 - decidim-meetings/spec/features/follow_meetings_spec.rb
+- decidim-meetings/spec/features/meeting_embeds_spec.rb
 - decidim-meetings/spec/features/meeting_registrations_spec.rb
 - decidim-meetings/spec/features/process_admin_manages_meetings_attachments_spec.rb
 - decidim-meetings/spec/features/process_admin_manages_meetings_spec.rb
@@ -2065,6 +2067,7 @@ files:
 - decidim-participatory_processes/spec/features/participatory_process_groups_spec.rb
 - decidim-participatory_processes/spec/features/participatory_process_steps_spec.rb
 - decidim-participatory_processes/spec/features/participatory_processes_spec.rb
+- decidim-participatory_processes/spec/features/process_embeds_spec.rb
 - decidim-participatory_processes/spec/forms/category_form_spec.rb
 - decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
 - decidim-participatory_processes/spec/forms/participatory_process_group_form_spec.rb
@@ -2202,6 +2205,7 @@ files:
 - decidim-proposals/spec/features/comments_spec.rb
 - decidim-proposals/spec/features/follow_proposals_spec.rb
 - decidim-proposals/spec/features/process_admin_manages_proposals_spec.rb
+- decidim-proposals/spec/features/proposal_embeds_spec.rb
 - decidim-proposals/spec/features/proposals_spec.rb
 - decidim-proposals/spec/features/report_proposal_spec.rb
 - decidim-proposals/spec/features/vote_proposal_spec.rb
@@ -2286,6 +2290,7 @@ files:
 - decidim-results/spec/features/explore_results_spec.rb
 - decidim-results/spec/features/follow_result_spec.rb
 - decidim-results/spec/features/process_admin_manages_results_spec.rb
+- decidim-results/spec/features/result_embeds_spec.rb
 - decidim-results/spec/forms/result_form_spec.rb
 - decidim-results/spec/models/result_spec.rb
 - decidim-results/spec/queries/decidim/results/filtered_results_spec.rb