decidim-system 0.11.2 → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d96434aad6ccc85a6766366c0b1a82ec6f777a33ea0f99f5a438add855bf0e56
-  data.tar.gz: b27ebc1e8bbba0da097781cb73a3b942771fc9b48aff23916a9f947eb65302cc
+  metadata.gz: 89f5e9259986af2b20e7140ed7366c4ac89f98e0a181c321c1a9013ddc968940
+  data.tar.gz: cedf74961fa59625d1582462b4b9f9da806fcdd213ae8a914cb5623fd203bf5f
 SHA512:
-  metadata.gz: 612c0bb14071f4224543168bb99a70c98823214c2d7063a8873dc7684c6fff4dcb1100a94de5b8bee59291403980ed1d589ffc40a598708c6fa4169c150cdecc
-  data.tar.gz: 8a11fa2c354b56c55da4167245ba16349067139cb016dc6d00f56c4840e0f7771c86f3b37fed83daf3f36c3281e5a026a2cbbaf831c8709e16cf2acfb55e03ec
+  metadata.gz: 7ea3126e9bcd1a1baefdba55e6e0cba130860e93a453ce0a708bb4dc5291e7a242cc6f3adcc61881aec50966098356fa5f23504e89d1582c7b39c7009de66d76
+  data.tar.gz: 1f3f306a875c8502ea88b807d65e16a23f09ddd044b44ff2b3e914e4a9b12ffd0302ece00eae1d6218f60e146ed6f7c84ec24ab62298bf6ad1e85a224e518e27

data/app/commands/decidim/system/create_default_pages.rb

@@ -18,8 +18,7 @@ module Decidim
       # Returns nothing.
       def call
         Decidim::StaticPage::DEFAULT_PAGES.map do |slug|
-          Decidim::StaticPage.find_or_create_by!(slug: slug) do |page|
-            page.organization = organization
+          Decidim::StaticPage.find_or_create_by!(organization: organization, slug: slug) do |page|
             page.title = localized_attribute(slug, :title)
             page.content = localized_attribute(slug, :content)
           end

data/app/commands/decidim/system/register_organization.rb

@@ -21,14 +21,16 @@ module Decidim
       # Returns nothing.
       def call
         return broadcast(:invalid) if form.invalid?
+        @organization = nil
+        invite_form = nil
 
         transaction do
           @organization = create_organization
           CreateDefaultPages.call(@organization)
           invite_form = invite_user_form(@organization)
           return broadcast(:invalid) if invite_form.invalid?
-          Decidim::InviteUser.call(invite_form)
         end
+        Decidim::InviteUser.call(invite_form) if @organization && invite_form
 
         broadcast(:ok)
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique

data/app/controllers/decidim/system/application_controller.rb

@@ -6,6 +6,7 @@ module Decidim
     class ApplicationController < ActionController::Base
       include FormFactory
       include PayloadInfo
+      include HttpCachingDisabler
 
       protect_from_forgery with: :exception, prepend: true
 

data/app/controllers/decidim/system/devise/sessions_controller.rb

@@ -6,9 +6,15 @@ module Decidim
       # Custom Sessions controller for Devise in order to use a custom layout
       # and views.
       class SessionsController < ::Devise::SessionsController
+        include Decidim::LocaleSwitcher
+
         helper Decidim::DecidimFormHelper
 
         layout "decidim/system/login"
+
+        private
+
+        def current_organization; end
       end
     end
   end

data/app/models/decidim/system/admin.rb

@@ -4,12 +4,16 @@ module Decidim
   module System
     # Admins are the users in charge of managing a Decidim installation.
     class Admin < ApplicationRecord
-      devise :database_authenticatable, :rememberable, :validatable
+      devise :database_authenticatable, :rememberable, :validatable, :timeoutable
 
       validates :email, uniqueness: true
 
       private
 
+      def timeout_in
+        1.hour
+      end
+
       # Changes default Devise behaviour to use ActiveJob to send async emails.
       def send_devise_notification(notification, *args)
         devise_mailer.send(notification, self, *args).deliver_later

data/db/seeds.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 if !Rails.env.production? || ENV["SEED"]
+  print "Creating seeds for decidim-system...\n" unless Rails.env.test?
+
   Decidim::System::Admin.find_or_initialize_by(email: "system@example.org").update!(
     password: "decidim123456",
     password_confirmation: "decidim123456"

data/lib/decidim/system/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-system version.
   module System
     def self.version
-      "0.11.2"
+      "0.12.0.pre"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-system
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -116,14 +116,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 description: System administration to create new organization in an installation.
 email:
 - josepjaume@gmail.com
@@ -223,9 +223,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6