decidim 0.0.5 → 0.0.6

data/decidim-results/config/locales/en.yml

@@ -1,5 +1,13 @@
 ---
 en:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Category
+        decidim_scope_id: Scope
+        description: Description
+        proposal_ids: Included proposals
+        title: Title
   decidim:
     features:
       results:
@@ -11,9 +19,9 @@ en:
             comments_blocked: Comments blocked
     resource_links:
       included_proposals:
-        proposals: Proposals included in this result
+        result_proposals: Proposals included in this result
       meetings_through_proposals:
-        meetings: Related meetings
+        result_meetings: Related meetings
     results:
       actions:
         confirm_destroy: Are you sure you want to delete this result?
@@ -55,6 +63,11 @@ en:
           category: Category
           scopes: Scopes
           search: Search
+        filters_small_view:
+          close_modal: Close modal
+          filter: Filter
+          filter_by: Filter by
+          unfold: Unfold
         show:
           stats:
             attendees: Attendees

data/decidim-results/config/locales/es.yml

@@ -1,4 +1,12 @@
 es:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Categoría
+        decidim_scope_id: Ámbito
+        description: Descripción
+        proposal_ids: Propuestas incluidas
+        title: Título
   decidim:
     features:
       results:
@@ -10,9 +18,9 @@ es:
             comments_blocked: Comentarios bloqueados
     resource_links:
       included_proposals:
-        proposals: Propuestas incluidas en este resultado
+        result_proposals: Propuestas incluidas en este resultado
       meetings_through_proposals:
-        meetings: Encuentros relacionados
+        result_meetings: Encuentros relacionados
     results:
       actions:
         confirm_destroy: '¿Está seguro de que quiere eliminar este resultado?'
@@ -54,6 +62,11 @@ es:
           category: Categoría
           scopes: Ámbitos
           search: Buscar
+        filters_small_view:
+          close_modal: Cerrar ventana
+          filter: Filtrar
+          filter_by: Filtrar por
+          unfold: Desplegar
         show:
           stats:
             attendees: Asistentes

data/decidim-results/config/locales/eu.yml

@@ -2,4 +2,60 @@ eu:
   decidim:
     features:
       results:
-        name: Emaitzak
+        name: Emaitzak
+    resource_links:
+      included_proposals:
+        result_proposals: Emaitza honetan jasotako proposamenak
+      meetings_through_proposals:
+        result_meetings: Honekin lotutako topaketak
+    results:
+      actions:
+        confirm_destroy: Ziur zaude emaitza hau ezabatu nahi duzula?
+        destroy: Garbitu
+        edit: Editatu
+        new: '%{name} berria'
+        title: Ekintzak
+      admin:
+        models:
+          result:
+            name: Emaitza
+        results:
+          create:
+            invalid: Arazo bat izan da emaitza hau sortzean.
+            success: Emaitza zuzen sortu da
+          destroy:
+            success: Emaitza zuzen ezabatu da.
+          edit:
+            title: Editatu emaitza
+            update: Eguneratu emaitza
+          index:
+            title: Emaitzak
+          new:
+            create: Sortu emaitza
+            title: Emaitza berria
+          update:
+            invalid: Arazo bat izan da emaitza hau eguneratzean.
+            success: Emaitza zuzen eguneratu da.
+      models:
+        result:
+          fields:
+            title: Izenburua
+      results:
+        count:
+          results_count:
+            one: Emaitza bat
+            other: "%{count} emaitza"
+        filters:
+          category: Kategoria
+          scopes: Esparruak
+          search: Bilatu
+        filters_small_view:
+          filter_by: 'Iragazi honen arabera:'
+        show:
+          stats:
+            attendees: Bertaratuak
+            comments: Iruzkinak
+            contributions: Ekarpenak
+            meetings: Topaketa-zerrenda
+            proposals: Proposamenak
+            votes: Euskarria

data/decidim-results/config/locales/fi.yml

@@ -0,0 +1,77 @@
+fi:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Kategoria
+        decidim_scope_id: Konteksti
+        description: Kuvaus
+        proposal_ids: Sisällytetyt ehdotukset
+        title: Otsikko
+  decidim:
+    features:
+      results:
+        name: Tulokset
+        settings:
+          global:
+            comments_enabled: Kommentointi sallittu
+          step:
+            comments_blocked: Kommentointi estetty
+    resource_links:
+      included_proposals:
+        result_proposals: Projektit, jotka sisältyvät tähän tulokseen
+      meetings_through_proposals:
+        result_meetings: Liittyvät tapaamiset
+    results:
+      actions:
+        confirm_destroy: Oletko varma, että haluat poistaa tämän tuloksen?
+        destroy: Poista
+        edit: Muokkaa
+        new: Uusi %{name}
+        title: Toiminnot
+      admin:
+        models:
+          result:
+            name: Tulos
+        results:
+          create:
+            invalid: Tuloksen luonnissa tapahtui virhe
+            success: Tulos luotu onnistuneesti
+          destroy:
+            success: Tulos poistettu onnistuneesti
+          edit:
+            title: Muokkaa tulosta
+            update: Päivitä tulos
+          index:
+            title: Tulokset
+          new:
+            create: Luo tulos
+            title: Uusi tulos
+          update:
+            invalid: Tuloksen päivityksessä tapahtui virhe
+            success: Tulos päivitetty onnistuneesti
+      models:
+        result:
+          fields:
+            title: Otsikko
+      results:
+        count:
+          results_count:
+            one: 1 tulos
+            other: "%{count} tulosta"
+        filters:
+          category: Kategoria
+          scopes: Konteksti
+          search: Haku
+        filters_small_view:
+          close_modal: Sulje ikkuna
+          filter: Suodata
+          filter_by: Suodata
+          unfold: Avaa
+        show:
+          stats:
+            attendees: Osallistujat
+            comments: Kommentit
+            contributions: Kontribuutiot
+            meetings: Tapaamiset
+            proposals: Ehdotukset
+            votes: Kannatukset

data/decidim-results/db/migrate/20170215132624_add_reference_to_results.rb

@@ -0,0 +1,7 @@
+class AddReferenceToResults < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_results_results, :reference, :string
+    Decidim::Results::Result.find_each(&:save)
+    change_column_null :decidim_results_results, :reference, false
+  end
+end

data/decidim-results/lib/decidim/results/test/factories.rb

@@ -3,6 +3,12 @@ require "decidim/faker/localized"
 require "decidim/dev"
 
 FactoryGirl.define do
+  factory :result_feature, parent: :feature do
+    name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :results).i18n_name }
+    manifest_name :results
+    participatory_process { create(:participatory_process, :with_steps) }
+  end
+
   factory :result, class: Decidim::Results::Result do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe "Comments", type: :feature, perform_enqueued: true do
+  let!(:feature) { create(:result_feature, organization: organization) }
+  let!(:commentable) { create(:result, feature: feature) }
+
+  let(:resource_path) { decidim_results.result_path(commentable, feature_id: feature, participatory_process_id: feature.participatory_process) }
+  include_examples "comments"
+end

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

@@ -38,6 +38,7 @@ describe "Explore results", type: :feature do
     it "shows all result info" do
       expect(page).to have_i18n_content(result.title)
       expect(page).to have_i18n_content(result.description)
+      expect(page).to have_content(result.reference)
 
       within ".section.view-side" do
         expect(page).to have_content(/Proposals/i)
@@ -162,6 +163,32 @@ describe "Explore results", type: :feature do
         visit_feature
       end
 
+      context "when the process has a linked scope" do
+        before do
+          participatory_process.update_attributes(scope: scope)
+          visit current_path
+        end
+
+        it "enables filtering by scope" do
+          within ".filters" do
+            expect(page).not_to have_content(/Scopes/i)
+          end
+        end
+      end
+
+      context "when the process has no linked scope" do
+        before do
+          participatory_process.update_attributes(scope: nil)
+          visit current_path
+        end
+
+        it "enables filtering by scope" do
+          within ".filters" do
+            expect(page).to have_content(/Scopes/i)
+          end
+        end
+      end
+
       context "by origin 'official'" do
         it "lists the filtered results" do
           within ".filters" do

data/decidim-results/spec/models/result_spec.rb

@@ -13,6 +13,7 @@ module Decidim
       include_examples "has feature"
       include_examples "has scope"
       include_examples "has category"
+      include_examples "has reference"
     end
   end
 end

data/decidim-results/spec/services/result_search_spec.rb

@@ -65,6 +65,15 @@ describe Decidim::Results::ResultSearch do
           expect(subject.results).to match_array [result1,result2]
         end
       end
+
+      context "when `global` is being sent" do
+        let!(:resource_without_scope) { create(:result, feature: current_feature, scope: nil)}
+        let(:params) { default_params.merge(scope_id: ["global"]) }
+
+        it "returns resources without a scope" do
+          expect(subject.results).to eq [resource_without_scope]
+        end
+      end
     end
 
     context "category_id" do

data/decidim-results/spec/shared/admin_shared_context.rb

@@ -1,6 +1,6 @@
 RSpec.shared_context "admin" do
   let(:organization) { create(:organization) }
-  let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@decidim.org") }
+  let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@example.org") }
   let(:participatory_process) { create(:participatory_process, :with_steps, organization: organization) }
   let(:process_admin) { create :user, :confirmed, organization: organization }
   let!(:user_role) { create :participatory_process_user_role, user: process_admin, participatory_process: participatory_process }

data/decidim-system/README.md

@@ -1,10 +1,12 @@
 # Decidim::System
-Short description and motivation.
+
+This engine adds an administration dashboard so admin can manage a Decidim deploy
+and its organizations when working in a multi-tenant environment.
 
 ## Usage
-How to use my plugin.
 
-## Installation
+`decidim-system` is already included in the `decidim` gem, but you can also include it separately:
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -16,13 +18,48 @@ And then execute:
 $ bundle
 ```
 
-Or install it yourself as:
-```bash
-$ gem install decidim-system
+## Multi-tenancy in Decidim
+
+A single Decidim deploy can be used by multiple organizations (tenants) at the same time. All resources and entities are always scoped to an organization.
+
+When using Decidim as multi-tenant, you should keep these in mind:
+
+* All organizations share the same database.
+* Each organization must have a different hostname.
+* Users aren't shared between each organization (the same email can be registered in different organizations and it will be considered as different users).
+* All configuration related to Decidim (`Decidim.config`) is shared between the organizations.
+* Stylesheets aren't customizable per-tenant so UI styles (colors and other variables) are shared.
+
+## Glossary
+
+* **Organization**: Each of the tenants using a Decidim deploy.
+* **System admin**: Users that can manage organizations in a Decidim deploy.
+* **Admins**: Users that can manage a **single** organization in a Decidim deploy.
+* **Participatory process admins**: Users that can manage a **single participatory process** in an organization in a Decidim deploy.
+
+## Managing System admins
+
+Currently Decidim doesn't provide a way to create the first System Admin in a new deployment. To do it, you should open a Rails console in your application and
+create it:
+
+```ruby
+Decidim::System::Admin.create!(
+  email: "your-email@example.org",
+  password: "your-safe-password",
+  password_confirmation: "your-safe-password"
+)
 ```
 
-## Contributing
-Contribution directions go here.
+Once you have created your first admin you can access the system dashboard at `https://your-decidim-deployment-host/system` and login with your newly created user.
+From the system dashboard you can add new admins.
+
+## Managing organizations
+
+Once you have your system admin setup you can also start managing the organizations in your deploy. To do it, login at the system dashboard and create a new organization
+following the form instructions. After creating it, a new admin user will be created and invited to start managing it.
+
+Remember that System admins and regular Admins are completely different users (they don't even share the same database table), so you can't use your
+system user to login in as an organization admin.
 
 ## License
 The gem is available as open source under the terms of the [AGPLv3 License](https://opensource.org/licenses/AGPL-3.0).

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

@@ -42,7 +42,10 @@ module Decidim
         Decidim::Organization.create!(
           name: form.name,
           host: form.host,
+          secondary_hosts: form.clean_secondary_hosts,
+          reference_prefix: form.reference_prefix,
           available_locales: form.available_locales,
+          available_authorizations: form.clean_available_authorizations,
           default_locale: form.default_locale
         )
       end

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

@@ -42,6 +42,8 @@ module Decidim
       def save_organization
         organization.name = form.name
         organization.host = form.host
+        organization.secondary_hosts = form.clean_secondary_hosts
+        organization.available_authorizations = form.clean_available_authorizations
 
         organization.save!
       end

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

@@ -4,10 +4,12 @@ module Decidim
     # The main application controller that inherits from Rails.
     class ApplicationController < ActionController::Base
       include FormFactory
+      include PayloadInfo
       protect_from_forgery with: :exception, prepend: true
 
       helper Decidim::TranslationsHelper
       helper Decidim::DecidimFormHelper
+      helper Decidim::ReplaceButtonsHelper
     end
   end
 end

data/decidim-system/app/forms/decidim/system/register_organization_form.rb

@@ -12,6 +12,7 @@ module Decidim
       attribute :organization_admin_name, String
       attribute :available_locales, Array
       attribute :default_locale, String
+      attribute :reference_prefix
 
       validates :organization_admin_email, :organization_admin_name, :name, :host, presence: true
       validates :available_locales, presence: true

data/decidim-system/app/forms/decidim/system/update_organization_form.rb

@@ -12,9 +12,27 @@ module Decidim
 
       attribute :name, String
       attribute :host, String
+      attribute :secondary_hosts, String
+      attribute :available_authorizations, Array[String]
 
+      validates :name, presence: true
+      validates :host, presence: true
       validate :validate_organization_uniqueness
 
+      def map_model(model)
+        self.secondary_hosts = model.secondary_hosts.join("\n")
+      end
+
+      def clean_secondary_hosts
+        return unless secondary_hosts
+        secondary_hosts.split("\n").map(&:chomp).select(&:present?)
+      end
+
+      def clean_available_authorizations
+        return unless available_authorizations
+        available_authorizations.select(&:present?)
+      end
+
       private
 
       def validate_organization_uniqueness