decidim 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87eb409fe358de2fd25fc2ad9a666eaf073cb45b
-  data.tar.gz: c09f08acc49fb022dfd5fa6c5dcd5361f0438f53
+  metadata.gz: 3e97ff36fe9b8afb5d18cd99bda0548b74fc4a76
+  data.tar.gz: 0b67d32ec3db0da5638529ca288650b33a7eb9bb
 SHA512:
-  metadata.gz: 4cde38e84e33301f84f820b345e15dac160b199c32e0772b02a85718836efb7fde6314efa4ab726676f286d33ac9733d25554f951156b0bb80578ec42d3309a5
-  data.tar.gz: c13ad956c5b71be8527b70ad32a039a97649eb39962f8d888fc4866172fd7c252a7284918816ef21da58baaf0d403ab4b959412a60cc01da5bc4d700d7cd3173
+  metadata.gz: 40eb6e5b1dac004d17df2bc5a55432b6ee03277de42a6af69f7788a238a66ae0bbd370cf7c93ff15b75afc7ab8f174239395aba0c625d774fcacace98e6a7d12
+  data.tar.gz: d1087f76397658a05d5c114fde4ac42e649e41a5a2d30f7a55c1fc9edc39a5f3740d44067ce5d1ccd5ea270250b40f5c1b8080b316db96bdabdd2dd7c8c7bcec

data/.github/ISSUE_TEMPLATE.md

@@ -1,12 +1,31 @@
-#### :tophat: User Story
+<!--
+1. Please check if an issue already exists so there are no duplicates
+2. Fill out the whole template so we have a good overview on the issue
+3. Do not remove any section of the template. If something is not applicable leave it empty but leave it in the Issue
+4. Please follow the template, otherwise we'll have to ask you to update it
+-->
 
+# This is a (Bug Report / Feature Proposal)
 
-#### :clipboard: Related documentation
+#### :tophat: Description
 
+For bug reports:
+* What went wrong?
+* What did you expect should have happened?
+* What was the config you used?
+* What stacktrace or error message from your provider did you see?
 
-#### :dart: Acceptance criteria
-
+For feature proposals:
+* What is the use case that should be solved. The more detail you describe this in the easier it is to understand for us.
+* If there is additional config how would it look
 
 #### :pushpin: Related issues
+* #12345
 
+#### :clipboard: Additional Data
 
+* ***Decidim deployment where you found the issue***:
+* ***Browser & version***:
+* ***Screenshot***:
+* ***Error messages***:
+* ***URL to reproduce the error***:

data/.travis.yml

@@ -40,7 +40,10 @@ before_install:
   # Repo for newer Node.js versions
   - curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
   - gem update --system
-  - yarn
+  - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
+  - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+  - sudo apt-get update -qq
+  - sudo apt-get install -y -qq yarn
 
 bundler_args: --jobs=3 --retry=3 --deployment --path="$HOME/.bundle"
 

data/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: .
   specs:
-    decidim (0.0.3)
-      decidim-admin (= 0.0.3)
-      decidim-api (= 0.0.3)
-      decidim-budgets (= 0.0.3)
-      decidim-comments (= 0.0.3)
-      decidim-core (= 0.0.3)
-      decidim-meetings (= 0.0.3)
-      decidim-pages (= 0.0.3)
-      decidim-proposals (= 0.0.3)
-      decidim-results (= 0.0.3)
-      decidim-system (= 0.0.3)
+    decidim (0.0.4)
+      decidim-admin (= 0.0.4)
+      decidim-api (= 0.0.4)
+      decidim-budgets (= 0.0.4)
+      decidim-comments (= 0.0.4)
+      decidim-core (= 0.0.4)
+      decidim-meetings (= 0.0.4)
+      decidim-pages (= 0.0.4)
+      decidim-proposals (= 0.0.4)
+      decidim-results (= 0.0.4)
+      decidim-system (= 0.0.4)
       rails (~> 5.0.0, >= 5.0.0.1)
       rails-i18n (~> 5.0.0, >= 5.0.0.1)
-    decidim-budgets (0.0.3)
-      decidim-comments (= 0.0.3)
-      decidim-core (= 0.0.3)
+    decidim-budgets (0.0.4)
+      decidim-comments (= 0.0.4)
+      decidim-core (= 0.0.4)
       kaminari (~> 1.0.0.rc1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-proposals (0.0.3)
-      decidim-comments (= 0.0.3)
-      decidim-core (= 0.0.3)
+    decidim-proposals (0.0.4)
+      decidim-comments (= 0.0.4)
+      decidim-core (= 0.0.4)
       kaminari (~> 1.0.1)
       rectify (~> 0.8.0)
       social-share-button (~> 0.8.8)
-    decidim-results (0.0.3)
-      decidim-comments (= 0.0.3)
-      decidim-core (= 0.0.3)
+    decidim-results (0.0.4)
+      decidim-comments (= 0.0.4)
+      decidim-core (= 0.0.4)
       kaminari (~> 1.0.0.rc1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
@@ -36,11 +36,11 @@ PATH
 PATH
   remote: decidim-admin
   specs:
-    decidim-admin (0.0.3)
+    decidim-admin (0.0.4)
       active_link_to (~> 1.0.0)
       cancancan (~> 1.15.0)
       carrierwave (~> 1.0.0.rc)
-      decidim-core (= 0.0.3)
+      decidim-core (= 0.0.4)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -53,7 +53,7 @@ PATH
 PATH
   remote: decidim-api
   specs:
-    decidim-api (0.0.3)
+    decidim-api (0.0.4)
       graphiql-rails (~> 1.4.1)
       graphql (~> 1.4.2)
       rack-cors (~> 0.4.0)
@@ -63,20 +63,20 @@ PATH
 PATH
   remote: decidim-comments
   specs:
-    decidim-comments (0.0.3)
-      decidim-core (= 0.0.3)
+    decidim-comments (0.0.4)
+      decidim-core (= 0.0.4)
       jquery-rails (~> 4.0)
       rails (~> 5.0.0, >= 5.0.0.1)
 
 PATH
   remote: decidim-core
   specs:
-    decidim-core (0.0.3)
+    decidim-core (0.0.4)
       active_link_to (~> 1.0.0)
       cancancan (~> 1.15.0)
       carrierwave (~> 1.0.0)
       date_validator (~> 0.9.0)
-      decidim-api (= 0.0.3)
+      decidim-api (= 0.0.4)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -85,7 +85,7 @@ PATH
       high_voltage (~> 3.0.0)
       jquery-rails (~> 4.2.2)
       mini_magick (~> 4.6.0)
-      omniauth (~> 1.3.1)
+      omniauth (~> 1.4.0)
       omniauth-facebook (~> 4.0.0)
       omniauth-google-oauth2 (~> 0.4.1)
       omniauth-twitter (~> 1.3.0)
@@ -98,22 +98,24 @@ PATH
       sassc-rails (~> 1.3.0)
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
+      wisper (~> 1.6.1)
 
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.0.3)
+    decidim-dev (0.0.4)
       byebug
       capybara (~> 2.12.0)
       capybara-screenshot (~> 1.0.14)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.5.0)
       db-query-matchers (~> 0.7.0)
-      decidim (= 0.0.3)
+      decidim (= 0.0.4)
       factory_girl_rails
-      faker (~> 1.7.2)
+      faker (~> 1.7.3)
       i18n-tasks (= 0.9.8)
       launchy
+      letter_opener_web (~> 1.3.0)
       listen (~> 3.1.0)
       poltergeist (~> 1.13.0)
       rails-controller-testing (~> 1.0.1)
@@ -126,10 +128,10 @@ PATH
 PATH
   remote: decidim-meetings
   specs:
-    decidim-meetings (0.0.3)
+    decidim-meetings (0.0.4)
       date_validator (~> 0.9)
-      decidim-core (= 0.0.3)
-      geocoder (~> 1.4.1)
+      decidim-core (= 0.0.4)
+      geocoder (~> 1.4.2)
       httparty (~> 0.14.0)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
@@ -139,17 +141,17 @@ PATH
 PATH
   remote: decidim-pages
   specs:
-    decidim-pages (0.0.3)
-      decidim-comments (= 0.0.3)
-      decidim-core (= 0.0.3)
+    decidim-pages (0.0.4)
+      decidim-comments (= 0.0.4)
+      decidim-core (= 0.0.4)
       rectify (~> 0.8.0)
 
 PATH
   remote: decidim-system
   specs:
-    decidim-system (0.0.3)
+    decidim-system (0.0.4)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.0.3)
+      decidim-core (= 0.0.4)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -248,7 +250,7 @@ GEM
     concurrent-ruby (1.0.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    css_parser (1.4.7)
+    css_parser (1.4.8)
       addressable
     database_cleaner (1.5.3)
     date_validator (0.9.0)
@@ -281,7 +283,7 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    faker (1.7.2)
+    faker (1.7.3)
       i18n (~> 0.5)
     faraday (0.10.1)
       multipart-post (>= 1.2, < 3)
@@ -299,12 +301,12 @@ GEM
       activesupport (>= 4.1)
       railties (>= 4.1)
       tzinfo (~> 1.2, >= 1.2.2)
-    geocoder (1.4.2)
+    geocoder (1.4.3)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     graphiql-rails (1.4.1)
       rails
-    graphql (1.4.2)
+    graphql (1.4.3)
     hashdiff (0.3.2)
     hashie (3.5.1)
     high_voltage (3.0.0)
@@ -346,6 +348,12 @@ GEM
     kaminari-core (1.0.1)
     launchy (2.4.3)
       addressable (~> 2.3)
+    letter_opener (1.4.1)
+      launchy (~> 2.2)
+    letter_opener_web (1.3.1)
+      actionmailer (>= 3.2)
+      letter_opener (~> 1.0)
+      railties (>= 3.2)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -374,7 +382,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.3.2)
+    omniauth (1.4.1)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
     omniauth-facebook (4.0.0)
@@ -394,7 +402,7 @@ GEM
       omniauth-oauth (~> 1.1)
       rack
     orm_adapter (0.5.0)
-    parser (2.3.3.1)
+    parser (2.4.0.0)
       ast (~> 2.2)
     pg (0.19.0)
     poltergeist (1.13.0)
@@ -528,7 +536,7 @@ GEM
     thread (0.2.2)
     thread_safe (0.3.5)
     tilt (2.0.6)
-    tins (1.13.0)
+    tins (1.13.2)
     truncato (0.7.9)
       htmlentities (~> 4.3.1)
       nokogiri (~> 1.7.0)
@@ -568,8 +576,8 @@ DEPENDENCIES
   decidim-dev!
   decidim-meetings!
   decidim-pages!
-  decidim-proposals (= 0.0.3)
-  decidim-results (= 0.0.3)
+  decidim-proposals (= 0.0.4)
+  decidim-results (= 0.0.4)
   decidim-system!
   rake (~> 12.0.0)
   rspec (~> 3.0)

data/Rakefile

@@ -4,7 +4,7 @@ require "rspec/core/rake_task"
 require_relative "lib/generators/decidim/app_generator"
 require_relative "lib/generators/decidim/docker_generator"
 
-DECIDIM_GEMS = %w(core system admin api pages meetings proposals comments).freeze
+DECIDIM_GEMS = %w(core system admin api pages meetings proposals comments results budgets).freeze
 
 RSpec::Core::RakeTask.new(:spec)
 

data/decidim-admin/app/commands/decidim/admin/create_participatory_process_admin.rb

@@ -26,6 +26,9 @@ module Decidim
 
         create_participatory_process_admin
         broadcast(:ok)
+      rescue ActiveRecord::RecordInvalid
+        form.errors.add(:email, :taken)
+        broadcast(:invalid)
       end
 
       private

data/decidim-admin/app/commands/decidim/admin/update_feature_permissions.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # This command gets called when permissions for a feature are updated
+    # in the admin panel.
+    class UpdateFeaturePermissions < Rectify::Command
+      attr_reader :form, :feature
+
+      # Public: Initializes the command.
+      #
+      # form    - The form from which the data in this feature comes from.
+      # feature - The feature to update.
+      def initialize(form, feature)
+        @form = form
+        @feature = feature
+      end
+
+      # Public: Sets the permissions for a feature.
+      #
+      # Broadcasts :ok if created, :invalid otherwise.
+      def call
+        return broadcast(:invalid) unless @form.valid?
+
+        update_permissions
+        broadcast(:ok)
+      end
+
+      private
+
+      def update_permissions
+        permissions = @form.permissions.inject({}) do |result, (key, value)|
+          serialized = {
+            "authorization_handler_name" => value.authorization_handler_name
+          }
+
+          serialized["options"] = JSON.parse(value.options) if value.options
+          result.update(key => serialized)
+        end
+
+        @feature.update_attributes!(
+          permissions: permissions
+        )
+      end
+    end
+  end
+end

data/decidim-admin/app/commands/decidim/admin/update_organization.rb

@@ -23,7 +23,14 @@ module Decidim
         return broadcast(:invalid) if form.invalid?
 
         update_organization
-        broadcast(:ok)
+
+        if @organization.valid?
+          broadcast(:ok, @organization)
+        else
+          form.errors.add(:official_img_header, @organization.errors[:official_img_header]) if @organization.errors.include? :official_img_header
+          form.errors.add(:official_img_footer, @organization.errors[:official_img_footer]) if @organization.errors.include? :official_img_footer
+          broadcast(:invalid)
+        end
       end
 
       private
@@ -31,19 +38,27 @@ module Decidim
       attr_reader :form, :organization
 
       def update_organization
-        organization.update_attributes!(attributes)
+        @organization.assign_attributes(attributes)
+        @organization.save! if @organization.valid?
       end
 
       def attributes
         {
           name: form.name,
           twitter_handler: form.twitter_handler,
+          facebook_handler: form.facebook_handler,
+          instagram_handler: form.instagram_handler,
+          youtube_handler: form.youtube_handler,
+          github_handler: form.github_handler,
           description: form.description,
           welcome_text: form.welcome_text,
           homepage_image: form.homepage_image || organization.homepage_image,
           logo: form.logo || organization.logo,
           favicon: form.favicon || organization.favicon,
           default_locale: form.default_locale,
+          official_img_header: form.official_img_header || organization.official_img_header,
+          official_img_footer: form.official_img_footer || organization.official_img_footer,
+          official_url: form.official_url,
           show_statistics: form.show_statistics
         }
       end

data/decidim-admin/app/commands/decidim/admin/update_participatory_process.rb

@@ -32,7 +32,6 @@ module Decidim
         end
       end
 
-
       private
 
       attr_reader :form
@@ -53,9 +52,12 @@ module Decidim
           promoted: form.promoted,
           description: form.description,
           short_description: form.short_description,
-          domain: form.domain,
           scope: form.scope,
           developer_group: form.developer_group,
+          local_area: form.local_area,
+          target: form.target,
+          participatory_scope: form.participatory_scope,
+          participatory_structure: form.participatory_structure,
           end_date: form.end_date
         }.compact
       end