decidim-system 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f6d5e3f0a0d7a4a86758f8fe63862a9ac9ee65
-  data.tar.gz: 3bd316067e87a2be366a8e95f1704e9bf5c10ca9
+  metadata.gz: 4f93d18c0f93f59bd9ee19e68639ecfb4b6fd869
+  data.tar.gz: 16d551410d03ff500ff581e9829c5c9eeb0ed5bb
 SHA512:
-  metadata.gz: 91ecfdcd85b0f2907146a7285dd7539c0894d2f5396eae7bbf47cbbcf3f4f5e9c79e9680e56c9b914d520917d7ee7846389ab7b4af1eae558a07809d270c751b
-  data.tar.gz: 02eb3eb788db1895eb350d6c6f4d56e4b394819a73a392f9b1142bb462ebd0f34ddb80e86da21162598451fec0842a48b59966fc8a0f1374e42e7c9331cc94c6
+  metadata.gz: 7222a28cbe8da7b70e89ba3c9fc5584a4142a8388210e3122c30e160bd0588bb0a2f1e2841a0c74840247e2c06e7b1c35d631c36709b73e44fd3f3120dc15dce
+  data.tar.gz: e098a0219be3a4571577fc9e311f3b4c09bdfcb746cfa7696e30ef451b4b875d2effb310e64d681d912eed45d829c1035fcb480a3c88e049a6e48714601f71e2

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

@@ -6,12 +6,12 @@ module Decidim
     class ApplicationController < ActionController::Base
       include FormFactory
       include PayloadInfo
+
       protect_from_forgery with: :exception, prepend: true
 
       helper Decidim::TranslationsHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
-
       helper Decidim::System::MenuHelper
     end
   end

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

@@ -7,6 +7,7 @@ module Decidim
       # and views.
       class SessionsController < ::Devise::SessionsController
         helper Decidim::DecidimFormHelper
+
         layout "decidim/system/login"
       end
     end

data/app/helpers/decidim/system/menu_helper.rb

@@ -6,7 +6,7 @@ module Decidim
     module MenuHelper
       # Public: Returns the main menu presenter object
       def main_menu
-        @main_menu ||= MenuPresenter.new(:system_menu, self)
+        @main_menu ||= ::Decidim::MenuPresenter.new(:system_menu, self)
       end
     end
   end

data/app/views/decidim/system/shared/_notices.html.erb

@@ -0,0 +1,11 @@
+<%= display_flash_messages %>
+
+<% if Decidim::Organization.none? %>
+  <div class="flash callout warning">
+    <% guide = link_to t(".our_getting_started_guide"),
+                       "https://github.com/decidim/decidim/blob/master/docs/getting_started.md",
+                       target: :blank %>
+
+    <%= t(".no_organization_warning_html", guide: guide) %>
+  </div>
+<% end %>

data/app/views/layouts/decidim/system/application.html.erb

@@ -29,7 +29,7 @@
               </section>
             <% end %>
 
-            <%= display_flash_messages %>
+            <%= render "decidim/system/shared/notices" %>
             <%= yield %>
           </div>
         </div>

data/app/views/layouts/decidim/system/login.html.erb

@@ -9,7 +9,7 @@
     <div class="login-form-wrapper">
       <div class="login-form">
         <h1>Decidim</h1>
-        <%= display_flash_messages %>
+        <%= render "decidim/system/shared/notices" %>
         <div class="login-form-inner">
           <%= yield %>
         </div>

data/config/locales/ca.yml

@@ -64,5 +64,9 @@ ca:
         update:
           error: S'ha produït un error en actualitzar aquesta organització.
           success: L'organització s'ha actualitzat correctament.
+      shared:
+        notices:
+          no_organization_warning_html: Has de crear una organització per començar. Assegura't de llegir %{guide} abans.
+          our_getting_started_guide: la guia d'introducció
       titles:
         dashboard: Tauler de control

data/config/locales/en.yml

@@ -65,5 +65,9 @@ en:
         update:
           error: There was an error when updating this organization.
           success: Organization updated successfully.
+      shared:
+        notices:
+          no_organization_warning_html: You must create an organization to get started. Make sure you read %{guide} before proceeding.
+          our_getting_started_guide: our getting started guide
       titles:
         dashboard: Dashboard

data/config/locales/es.yml

@@ -64,5 +64,9 @@ es:
         update:
           error: Se ha producido un error al actualizar esta organización.
           success: Organización actualizada correctamente.
+      shared:
+        notices:
+          no_organization_warning_html: Debes crear una organización para comenzar. Asegúrate de leer %{guide} antes de continuar.
+          our_getting_started_guide: nuestra guía de inicio
       titles:
         dashboard: Panel de control

data/db/migrate/20160919105637_devise_create_decidim_admins.rb

@@ -4,25 +4,25 @@ class DeviseCreateDecidimAdmins < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_system_admins do |t|
       ## Database authenticatable
-      t.string :email,              null: false, default: ""
+      t.string :email, null: false, default: ""
       t.string :encrypted_password, null: false, default: ""
 
       ## Recoverable
-      t.string   :reset_password_token
+      t.string :reset_password_token
       t.datetime :reset_password_sent_at
 
       ## Rememberable
       t.datetime :remember_created_at
 
       ## Lockable
-      t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
-      t.string   :unlock_token # Only if unlock strategy is :email or :both
+      t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      t.string :unlock_token # Only if unlock strategy is :email or :both
       t.datetime :locked_at
 
       t.timestamps null: false
     end
 
-    add_index :decidim_system_admins, :email,                unique: true
+    add_index :decidim_system_admins, :email, unique: true
     add_index :decidim_system_admins, :reset_password_token, unique: true
   end
 end

data/db/seeds.rb

@@ -7,7 +7,7 @@ if !Rails.env.production? || ENV["SEED"]
     password_confirmation: "decidim123456"
   )
 
-  Decidim::Organization.all.each do |organization|
+  Decidim::Organization.find_each do |organization|
     Decidim::System::CreateDefaultPages.call(organization)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-system
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +158,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 description: System administration to create new organization in an installation.
 email:
 - josepjaume@gmail.com
@@ -223,6 +223,7 @@ files:
 - app/views/decidim/system/organizations/index.html.erb
 - app/views/decidim/system/organizations/new.html.erb
 - app/views/decidim/system/organizations/show.html.erb
+- app/views/decidim/system/shared/_notices.html.erb
 - app/views/layouts/decidim/system/_header.html.erb
 - app/views/layouts/decidim/system/_login_items.html.erb
 - app/views/layouts/decidim/system/_sidebar.html.erb