decidim 0.4.0 → 0.4.1

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    decidim (0.4.0)
-      decidim-admin (= 0.4.0)
-      decidim-api (= 0.4.0)
-      decidim-budgets (= 0.4.0)
-      decidim-comments (= 0.4.0)
-      decidim-core (= 0.4.0)
-      decidim-meetings (= 0.4.0)
-      decidim-pages (= 0.4.0)
-      decidim-proposals (= 0.4.0)
-      decidim-results (= 0.4.0)
-      decidim-surveys (= 0.4.0)
-      decidim-system (= 0.4.0)
-    decidim-admin (0.4.0)
+    decidim (0.4.1)
+      decidim-admin (= 0.4.1)
+      decidim-api (= 0.4.1)
+      decidim-budgets (= 0.4.1)
+      decidim-comments (= 0.4.1)
+      decidim-core (= 0.4.1)
+      decidim-meetings (= 0.4.1)
+      decidim-pages (= 0.4.1)
+      decidim-proposals (= 0.4.1)
+      decidim-results (= 0.4.1)
+      decidim-surveys (= 0.4.1)
+      decidim-system (= 0.4.1)
+    decidim-admin (0.4.1)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.4.0)
+      decidim-core (= 0.4.1)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -24,29 +24,29 @@ PATH
       rails (~> 5.1.1)
       rectify (~> 0.9.1)
       sassc-rails (~> 1.3.0)
-    decidim-api (0.4.0)
+    decidim-api (0.4.1)
       graphiql-rails (~> 1.4.2)
       graphql (~> 1.6.0)
       rack-cors (~> 0.4.0)
       rails (~> 5.1.1)
       sprockets-es6 (~> 0.9.2)
-    decidim-budgets (0.4.0)
-      decidim-comments (= 0.4.0)
-      decidim-core (= 0.4.0)
+    decidim-budgets (0.4.1)
+      decidim-comments (= 0.4.1)
+      decidim-core (= 0.4.1)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.4.0)
-      decidim-core (= 0.4.0)
+    decidim-comments (0.4.1)
+      decidim-core (= 0.4.1)
       jquery-rails (~> 4.0)
       rails (~> 5.1.1)
-    decidim-core (0.4.0)
+    decidim-core (0.4.1)
       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.4.0)
+      decidim-api (= 0.4.1)
       devise (~> 4.3)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -74,36 +74,36 @@ PATH
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
       wisper (~> 2.0.0)
-    decidim-meetings (0.4.0)
+    decidim-meetings (0.4.1)
       date_validator (~> 0.9)
-      decidim-core (= 0.4.0)
+      decidim-core (= 0.4.1)
       httparty (~> 0.15.0)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-pages (0.4.0)
-      decidim-comments (= 0.4.0)
-      decidim-core (= 0.4.0)
+    decidim-pages (0.4.1)
+      decidim-comments (= 0.4.1)
+      decidim-core (= 0.4.1)
       rectify (~> 0.9.1)
-    decidim-proposals (0.4.0)
-      decidim-comments (= 0.4.0)
-      decidim-core (= 0.4.0)
+    decidim-proposals (0.4.1)
+      decidim-comments (= 0.4.1)
+      decidim-core (= 0.4.1)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       social-share-button (~> 0.10.0)
-    decidim-results (0.4.0)
-      decidim-comments (= 0.4.0)
-      decidim-core (= 0.4.0)
+    decidim-results (0.4.1)
+      decidim-comments (= 0.4.1)
+      decidim-core (= 0.4.1)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-surveys (0.4.0)
-      decidim-core (= 0.4.0)
+    decidim-surveys (0.4.1)
+      decidim-core (= 0.4.1)
       jquery-tmpl-rails (~> 1.1.0)
-    decidim-system (0.4.0)
+    decidim-system (0.4.1)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.4.0)
+      decidim-core (= 0.4.1)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.1)
@@ -116,14 +116,14 @@ PATH
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.4.0)
+    decidim-dev (0.4.1)
       byebug
       capybara (~> 2.14.0)
       capybara-screenshot (~> 1.0.14)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.6.0)
       db-query-matchers (~> 0.9.0)
-      decidim (= 0.4.0)
+      decidim (= 0.4.1)
       factory_girl_rails
       faker (~> 1.7.3)
       i18n-tasks (= 0.9.15)
@@ -143,25 +143,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.1)
-      actionpack (= 5.1.1)
+    actioncable (5.1.2)
+      actionpack (= 5.1.2)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
+    actionmailer (5.1.2)
+      actionpack (= 5.1.2)
+      actionview (= 5.1.2)
+      activejob (= 5.1.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.1)
-      actionview (= 5.1.1)
-      activesupport (= 5.1.1)
+    actionpack (5.1.2)
+      actionview (= 5.1.2)
+      activesupport (= 5.1.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.1)
-      activesupport (= 5.1.1)
+    actionview (5.1.2)
+      activesupport (= 5.1.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -169,16 +169,16 @@ GEM
     active_link_to (1.0.4)
       actionpack
       addressable
-    activejob (5.1.1)
-      activesupport (= 5.1.1)
+    activejob (5.1.2)
+      activesupport (= 5.1.2)
       globalid (>= 0.3.6)
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
+    activemodel (5.1.2)
+      activesupport (= 5.1.2)
+    activerecord (5.1.2)
+      activemodel (= 5.1.2)
+      activesupport (= 5.1.2)
       arel (~> 8.0)
-    activesupport (5.1.1)
+    activesupport (5.1.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -187,7 +187,7 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     arel (8.0.0)
     ast (2.3.0)
-    autoprefixer-rails (7.1.1.2)
+    autoprefixer-rails (7.1.2.3)
       execjs
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -201,14 +201,14 @@ GEM
     builder (3.2.3)
     byebug (9.0.6)
     cancancan (2.0.0)
-    capybara (2.14.3)
+    capybara (2.14.4)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (1.0.14)
+    capybara-screenshot (1.0.17)
       capybara (>= 1.0, < 3)
       launchy
     carrierwave (1.1.0)
@@ -260,7 +260,7 @@ GEM
       thread
       thread_safe
     equalizer (0.0.11)
-    erubi (1.6.0)
+    erubi (1.6.1)
     erubis (2.7.0)
     execjs (2.7.0)
     factory_girl (4.8.0)
@@ -291,15 +291,15 @@ GEM
       activesupport (>= 4.2.0)
     graphiql-rails (1.4.2)
       rails
-    graphql (1.6.4)
+    graphql (1.6.6)
     hashdiff (0.3.4)
-    hashie (3.5.5)
+    hashie (3.5.6)
     high_voltage (3.0.0)
     highline (1.7.8)
     htmlentities (4.3.4)
     httparty (0.15.5)
       multi_xml (>= 0.5.2)
-    i18n (0.8.4)
+    i18n (0.8.6)
     i18n-tasks (0.9.15)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
@@ -311,7 +311,7 @@ GEM
       rainbow (~> 2.2)
       terminal-table (>= 1.5.1)
     ice_nine (0.11.2)
-    invisible_captcha (0.9.2)
+    invisible_captcha (0.9.3)
       rails (>= 3.2.0)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
@@ -368,7 +368,7 @@ GEM
       rack (>= 1.6.2, < 3)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (0.5.0)
+    omniauth-google-oauth2 (0.5.1)
       jwt (~> 1.5)
       multi_json (~> 1.3)
       omniauth (>= 1.1.1)
@@ -404,17 +404,17 @@ GEM
     rack-cors (0.4.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.1.1)
-      actioncable (= 5.1.1)
-      actionmailer (= 5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
-      activemodel (= 5.1.1)
-      activerecord (= 5.1.1)
-      activesupport (= 5.1.1)
+    rails (5.1.2)
+      actioncable (= 5.1.2)
+      actionmailer (= 5.1.2)
+      actionpack (= 5.1.2)
+      actionview (= 5.1.2)
+      activejob (= 5.1.2)
+      activemodel (= 5.1.2)
+      activerecord (= 5.1.2)
+      activesupport (= 5.1.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.1)
+      railties (= 5.1.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)
@@ -428,16 +428,16 @@ GEM
     rails-i18n (5.0.4)
       i18n (~> 0.7)
       railties (~> 5.0)
-    railties (5.1.1)
-      actionpack (= 5.1.1)
-      activesupport (= 5.1.1)
+    railties (5.1.2)
+      actionpack (= 5.1.2)
+      activesupport (= 5.1.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
     rake (12.0.0)
-    rb-fsevent (0.9.8)
+    rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rectify (0.9.1)
@@ -487,7 +487,7 @@ GEM
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sass (3.4.24)
-    sassc (1.11.2)
+    sassc (1.11.4)
       bundler
       ffi (~> 1.9.6)
       sass (>= 3.3.0)

data/decidim-admin/app/assets/stylesheets/decidim/admin/_variables.scss

@@ -5,3 +5,5 @@ $brand: #9675ce !default;
 $twitter: #55acee !default;
 $facebook: #3b5998 !default;
 $google: #dd4b39 !default;
+
+$secondary: #599aa6 !default;

data/decidim-admin/app/assets/stylesheets/decidim/admin/extra/_cards.scss

@@ -4,3 +4,9 @@
     float: right;
   }
 }
+
+form {
+  .card {
+    overflow: initial;
+  }
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/modules/_typography.scss

@@ -13,3 +13,7 @@
 .text-alert{
   color: $alert-color;
 }
+
+.text-info{
+  color: $secondary;
+}

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

@@ -41,7 +41,7 @@ module Decidim
       attr_reader :form, :participatory_process, :current_user, :user
 
       def create_role
-        ParticipatoryProcessUserRole.find_or_create_by!(
+        Decidim::ParticipatoryProcessUserRole.find_or_create_by!(
           role: form.role.to_sym,
           user: user,
           participatory_process: @participatory_process
@@ -68,9 +68,7 @@ module Decidim
       end
 
       def new_user
-        new_user_form = user_form.dup
-        new_user_form.roles = []
-        @new_user ||= InviteUser.call(new_user_form) do
+        @new_user ||= InviteUser.call(user_form) do
           on(:ok) do |user|
             return user
           end
@@ -81,7 +79,7 @@ module Decidim
         OpenStruct.new(name: form.name,
                        email: form.email.downcase,
                        organization: participatory_process.organization,
-                       roles: [form.role.to_sym],
+                       admin: false,
                        invited_by: current_user,
                        invitation_instructions: invitation_instructions)
       end

data/decidim-admin/app/constraints/decidim/admin/organization_dashboard_constraint.rb

@@ -34,7 +34,7 @@ module Decidim
       end
 
       def ability
-        Decidim::Admin::Abilities::Base.new(user, current_organization: organization)
+        Decidim::Admin::Abilities::BaseAbility.new(user, current_organization: organization)
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/application_controller.rb

@@ -33,7 +33,7 @@ module Decidim
       # Overwrites `cancancan`'s method to point to the correct ability class,
       # since the gem expects the ability class to be in the root namespace.
       def current_ability_klass
-        Decidim::Admin::Abilities::Base
+        Decidim::Admin::Abilities::BaseAbility
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/categories_controller.rb

@@ -15,17 +15,17 @@ module Decidim
 
       def new
         authorize! :create, Decidim::Category
-        @form = form(CategoryForm).from_params({}, current_process: participatory_process)
+        @form = form(CategoryForm).from_params({}, current_process: current_participatory_process)
       end
 
       def create
         authorize! :create, Decidim::Category
-        @form = form(CategoryForm).from_params(params, current_process: participatory_process)
+        @form = form(CategoryForm).from_params(params, current_process: current_participatory_process)
 
-        CreateCategory.call(@form, participatory_process) do
+        CreateCategory.call(@form, current_participatory_process) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.create.success", scope: "decidim.admin")
-            redirect_to participatory_process_categories_path(participatory_process)
+            redirect_to participatory_process_categories_path(current_participatory_process)
           end
 
           on(:invalid) do
@@ -38,18 +38,18 @@ module Decidim
       def edit
         @category = collection.find(params[:id])
         authorize! :update, @category
-        @form = form(CategoryForm).from_model(@category, current_process: participatory_process)
+        @form = form(CategoryForm).from_model(@category, current_process: current_participatory_process)
       end
 
       def update
         @category = collection.find(params[:id])
         authorize! :update, @category
-        @form = form(CategoryForm).from_params(params, current_process: participatory_process)
+        @form = form(CategoryForm).from_params(params, current_process: current_participatory_process)
 
         UpdateCategory.call(@category, @form) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.update.success", scope: "decidim.admin")
-            redirect_to participatory_process_categories_path(participatory_process)
+            redirect_to participatory_process_categories_path(current_participatory_process)
           end
 
           on(:invalid) do
@@ -77,14 +77,14 @@ module Decidim
             flash[:alert] = I18n.t("categories.destroy.error", scope: "decidim.admin")
           end
 
-          redirect_back(fallback_location: participatory_process_categories_path(participatory_process))
+          redirect_back(fallback_location: participatory_process_categories_path(current_participatory_process))
         end
       end
 
       private
 
       def collection
-        @collection ||= participatory_process.categories.includes(:subcategories)
+        @collection ||= current_participatory_process.categories.includes(:subcategories)
       end
     end
   end