decidim-assemblies 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc34853438f825b6eca0f753a31009be30fcce0
-  data.tar.gz: 43a82d4448d071c928836894354865b77a24191a
+  metadata.gz: 6e0fb8b56f765e86cd93abd8ca4eb2c1ebdbf2e0
+  data.tar.gz: 57cd03c59b0001a4e8122e4d040116859ce67d9d
 SHA512:
-  metadata.gz: c0a749e32891938c65dd42303d6e73ec268a9b0f3acc2ab53063fb1a92e14b1092559d85ad76bf2d44acc9bbf0fb3e5c35ee00afb0d5fb60a5aec7558a1eb5f7
-  data.tar.gz: 017c310a9486c483c56bfe73247f0068ecaa26e32278318b087742214e0c0f29ac0d7c2f44eb5addcf020aa97aa0da6283aab75d4dbd53c64bc90ac01a22614b
+  metadata.gz: ee0f9a79a49630fc3fbd459d21e02796896897419fdc67fbcdbeda53a32adca0da2af6205592533a76d4d1f1aaf80bb197f78aa96005fc9670f4d7bc2349bce6
+  data.tar.gz: 86762612fe187336dd87d61c4f39b04e662821b4133eb45c5d3772df0f73e5285812e9a11a3644b8f095719c35e15c6c8d494cda0d00854ab878c804d061b8f8

data/app/constraints/decidim/assemblies/current_assembly.rb

@@ -30,7 +30,13 @@ module Decidim
       end
 
       def detect_current_assembly(params)
-        OrganizationAssemblies.new(@organization).query.find_by_id(params["assembly_id"])
+        organization_assemblies.where(slug: params["assembly_slug"]).or(
+          organization_assemblies.where(id: params["assembly_id"])
+        ).first!
+      end
+
+      def organization_assemblies
+        @organization_assemblies ||= OrganizationAssemblies.new(@organization).query
       end
     end
   end

data/app/controllers/concerns/decidim/assemblies/needs_assembly.rb

@@ -42,7 +42,11 @@ module Decidim
 
         def detect_assembly
           request.env["current_assembly"] ||
-            OrganizationAssemblies.new(current_organization).query.find(params[:assembly_id] || params[:id])
+            organization_assemblies.find_by!(slug: params[:assembly_slug] || params[:slug])
+        end
+
+        def organization_assemblies
+          @organization_assemblies ||= OrganizationAssemblies.new(current_organization).query
         end
       end
     end

data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb

@@ -45,7 +45,10 @@ module Decidim
 
         def update
           authorize! :update, current_assembly
-          @form = form(AssemblyForm).from_params(assembly_params)
+          @form = form(AssemblyForm).from_params(
+            assembly_params,
+            assembly_id: current_assembly.id
+          )
 
           UpdateAssembly.call(current_assembly, @form) do
             on(:ok) do |assembly|
@@ -76,7 +79,9 @@ module Decidim
         private
 
         def current_assembly
-          @current_assembly ||= collection.find(params[:id]) if params[:id]
+          @current_assembly ||= collection.where(slug: params[:slug]).or(
+            collection.where(id: params[:slug])
+          ).first
         end
 
         def collection

data/app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb

@@ -11,7 +11,7 @@ module Decidim
         include Decidim::Admin::Concerns::HasAttachments
 
         def after_destroy_path
-          assembly_attachments_path(current_assembly.id)
+          assembly_attachments_path(current_assembly)
         end
 
         def attached_to

data/app/controllers/decidim/assemblies/assemblies_controller.rb

@@ -16,6 +16,8 @@ module Decidim
       helper_method :collection, :promoted_assemblies, :assemblies, :stats
 
       def index
+        redirect_to "/404" if published_assemblies.none?
+
         authorize! :read, Assembly
       end
 
@@ -25,6 +27,10 @@ module Decidim
 
       private
 
+      def published_assemblies
+        @published_assemblies ||= OrganizationPublishedAssemblies.new(current_organization)
+      end
+
       def assemblies
         @assemblies ||= OrganizationPrioritizedAssemblies.new(current_organization)
       end

data/app/controllers/decidim/assemblies/assembly_widgets_controller.rb

@@ -6,7 +6,7 @@ module Decidim
       private
 
       def model
-        @model ||= Assembly.find(params[:assembly_id])
+        @model ||= Assembly.where(slug: params[:assembly_slug]).first
       end
 
       def current_participatory_space

data/app/forms/decidim/assemblies/admin/assembly_copy_form.rb

@@ -17,9 +17,9 @@ module Decidim
         attribute :copy_categories, Boolean
         attribute :copy_features, Boolean
 
-        validates :slug, presence: true
+        validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
         validates :title, translatable_presence: true
-        validate :slug, :slug_uniqueness
+        validate :slug_uniqueness
 
         private
 

data/app/forms/decidim/assemblies/admin/assembly_form.rb

@@ -33,11 +33,11 @@ module Decidim
         attribute :remove_banner_image
         attribute :show_statistics, Boolean
 
-        validates :slug, presence: true
+        validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
         validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
 
-        validate :slug, :slug_uniqueness
+        validate :slug_uniqueness
 
         validates :hero_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
         validates :banner_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
@@ -53,7 +53,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationAssemblies.new(current_organization).query.where(slug: slug).where.not(id: id).any?
+          return unless OrganizationAssemblies.new(current_organization).query.where(slug: slug).where.not(id: context[:assembly_id]).any?
 
           errors.add(:slug, :taken)
         end

data/app/models/decidim/assembly.rb

@@ -25,8 +25,8 @@ module Decidim
 
     has_many :features, as: :participatory_space
 
-    validates :slug, presence: true
     validates :slug, uniqueness: { scope: :organization }
+    validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
 
     mount_uploader :hero_image, Decidim::HeroImageUploader
     mount_uploader :banner_image, Decidim::BannerImageUploader
@@ -41,5 +41,9 @@ module Decidim
     def hashtag
       attributes["hashtag"].to_s.delete("#")
     end
+
+    def to_param
+      slug
+    end
   end
 end

data/app/views/decidim/assemblies/_assembly.html.erb

@@ -8,7 +8,7 @@
       <%= link_to assembly_path(assembly), class: "card__link" do %>
         <h4 class="card__title"><%= translated_attribute assembly.title %></h4>
       <% end %>
-      <p class="card__desc"><%== html_truncate(translated_attribute(assembly.short_description), length: 630, separator: '...') %></p>
+      <p class="card__desc"><%= sanitize html_truncate(translated_attribute(assembly.short_description), length: 630, separator: '...') %></p>
     </div>
     <div class="card__footer">
       <div class="card__support">

data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb

@@ -1,3 +1,5 @@
+<%= javascript_include_tag "decidim/slug_form" %>
+
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title"><%= t "assemblies.form.title", scope: "decidim.admin" %></h2>
@@ -13,8 +15,9 @@
     </div>
 
     <div class="row">
-      <div class="columns xlarge-6">
+      <div class="columns xlarge-6 slug">
         <%= form.text_field :slug %>
+        <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url(:assemblies, form.object.slug)) %></p>
       </div>
 
       <div class="columns xlarge-6">

data/app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb

@@ -1,3 +1,5 @@
+<%= javascript_include_tag "decidim/slug_form" %>
+
 <div class="card" id="assemblies">
   <div class="card-divider">
     <h2 class="card-title"><%= title %></h2>
@@ -9,8 +11,9 @@
         <div class="column xlarge-8">
           <%= form.translated :text_field, :title, autofocus: true %>
         </div>
-        <div class="column xlarge-4">
+        <div class="column xlarge-4 slug">
           <%= form.text_field :slug %>
+          <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url(:assemblies, form.object.slug)) %></p>
         </div>
       </div>
       <div class="card">

data/app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb

@@ -5,7 +5,7 @@
         <%= link_to assembly_path(promoted_assembly), class: "card__link" do %>
           <h2 class="card__title"><%= translated_attribute promoted_assembly.title %></h2>
         <% end %>
-        <%== html_truncate(translated_attribute(promoted_assembly.short_description), length: 630, separator: '...') %>
+        <%= sanitize html_truncate(translated_attribute(promoted_assembly.short_description), length: 630, separator: '...') %>
         <%= link_to assembly_path(promoted_assembly), class: "button secondary small hollow card__button" do %>
           <%= t("assemblies.promoted_assembly.more_info", scope: "layouts.decidim") %>
         <% end %>

data/app/views/decidim/assemblies/assemblies/index.html.erb

@@ -11,7 +11,7 @@
   <section id="assemblies-grid" class="section row collapse">
     <%= render partial: "decidim/assemblies/order_by_assemblies" %>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
-      <%= render(collection) || render(partial: "no_assemblies_yet") %>
+      <%= render(collection) %>
     </div>
   </section>
 </main>

data/app/views/decidim/assemblies/assemblies/show.html.erb

@@ -11,9 +11,9 @@
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
         <div class="lead">
-          <%== translated_attribute(current_assembly.short_description) %>
+          <%= sanitize translated_attribute(current_assembly.short_description) %>
         </div>
-        <%== translated_attribute(current_assembly.description) %>
+        <%= sanitize translated_attribute(current_assembly.description) %>
       </div>
       <%= attachments_for current_assembly %>
     </div>
@@ -22,42 +22,42 @@
         <% if translated_attribute(current_assembly.meta_scope).present? %>
           <div class="definition-data__item scope">
             <span class="definition-data__title"><%= t("assemblies.show.scope", scope: "decidim") %></span>
-              <%== translated_attribute(current_assembly.meta_scope) %>
+              <%= translated_attribute(current_assembly.meta_scope) %>
           </div>
         <% end %>
 
         <% if translated_attribute(current_assembly.developer_group).present? %>
           <div class="definition-data__item developer-group">
             <span class="definition-data__title"><%= t("assemblies.show.developer_group", scope: "decidim") %></span>
-              <%== translated_attribute(current_assembly.developer_group) %>
+              <%= translated_attribute(current_assembly.developer_group) %>
           </div>
         <% end %>
 
         <% if translated_attribute(current_assembly.local_area).present? %>
           <div class="definition-data__item local_area">
             <span class="definition-data__title"><%= t("assemblies.show.local_area", scope: "decidim") %></span>
-              <%== translated_attribute(current_assembly.local_area) %>
+              <%= translated_attribute(current_assembly.local_area) %>
           </div>
         <% end %>
 
          <% if translated_attribute(current_assembly.target).present? %>
           <div class="definition-data__item target">
             <span class="definition-data__title"><%= t("assemblies.show.target", scope: "decidim") %></span>
-              <%== translated_attribute(current_assembly.target) %>
+              <%= translated_attribute(current_assembly.target) %>
           </div>
         <% end %>
 
          <% if translated_attribute(current_assembly.participatory_scope).present? %>
           <div class="definition-data__item participatory_scope">
             <span class="definition-data__title"><%= t("assemblies.show.participatory_scope", scope: "decidim") %></span>
-              <%== translated_attribute(current_assembly.participatory_scope) %>
+              <%= translated_attribute(current_assembly.participatory_scope) %>
           </div>
         <% end %>
 
         <% if translated_attribute(current_assembly.participatory_structure).present? %>
           <div class="definition-data__item participatory_structure">
             <span class="definition-data__title"><%= t("assemblies.show.participatory_structure", scope: "decidim") %></span>
-              <%== translated_attribute(current_assembly.participatory_structure) %>
+              <%= translated_attribute(current_assembly.participatory_structure) %>
           </div>
         <% end %>
       </div>

data/app/views/decidim/assemblies/assembly_widgets/show.html.erb

@@ -1,6 +1,6 @@
 <% content_for(:header, "false") %>
 <% content_for(:title, translated_attribute(model.title)) %>
-<p class="card__desc"><%== html_truncate(translated_attribute(model.short_description), length: 630, separator: '...') %></p>
+<p class="card__desc"><%= sanitize html_truncate(translated_attribute(model.short_description), length: 630, separator: '...') %></p>
 <% content_for(:footer) do %>
   <div class="card__support">
     <span class="card--process__small"></span>

data/app/views/layouts/decidim/_assembly_header.html.erb

@@ -39,7 +39,7 @@
         <div class="row column process-nav__content is-active" id="process-nav-content" data-toggler=".is-active">
           <ul>
             <li class="<%= "is-active" if is_active_link?(decidim_assemblies.assembly_path(current_assembly), :exclusive) %>">
-              <%= active_link_to decidim_assemblies.assembly_path(current_assembly), active: :exact, class: "process-nav__link", class_active: "is-active" do %>
+              <%= active_link_to decidim_assemblies.assembly_path(current_assembly), active: :exclusive, class: "process-nav__link", class_active: "is-active" do %>
                 <%= external_icon "decidim/assemblies/assembly.svg" %>
                 <%= t ".assembly_menu_item" %>
               <% end %>

data/app/views/layouts/decidim/admin/assembly.html.erb

@@ -31,13 +31,13 @@
         </li>
       <% end %>
       <% if can? :read, Decidim::Attachment %>
-        <li <% if is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_assembly.id)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_attachments_path(current_assembly.id) %>
+        <li <% if is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_assembly)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_attachments_path(current_assembly) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Moderation %>
-        <li <% if is_active_link?(decidim_admin_assemblies.moderations_path(current_assembly.id)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.moderations_path(current_assembly.id) %>
+        <li <% if is_active_link?(decidim_admin_assemblies.moderations_path(current_assembly)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.moderations_path(current_assembly) %>
         </li>
       <% end %>
     </ul>

data/app/views/layouts/decidim/assembly.html.erb

@@ -19,12 +19,8 @@
       </div>
     </div>
   <% end %>
-<% end %>
 
-<% if try(:current_feature) %>
-  <% current_feature.manifest.actions.each do |action| %>
-    <%= action_authorization_modal(action) %>
-  <% end %>
+  <%= render "layouts/decidim/feature_authorization_modals" %>
 <% end %>
 
 <% provide :meta_image_url, current_assembly.banner_image.url %>

data/config/locales/ca.yml

@@ -79,6 +79,13 @@ ca:
       titles:
         assemblies: Assemblees
     assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'Els noms curts d''URL s''utilitzen per generar els URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
       index:
         title: Assemblees
       show:
@@ -111,8 +118,6 @@ ca:
           take_part: Participa
         index:
           promoted_assemblies: Assemblees destacades
-        no_assemblies_yet:
-          no_assemblies_yet: Encara no hi ha cap assemblea!
         order_by_assemblies:
           assemblies:
             one: "%{count} assemblea"

data/config/locales/en.yml

@@ -79,6 +79,13 @@ en:
       titles:
         assemblies: Assemblies
     assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
       index:
         title: Assemblies
       show:
@@ -94,7 +101,7 @@ en:
         comments_count: Comments
         headline: Activity
         meetings_count: Meetings
-        orders_count: Orders
+        orders_count: Votes
         pages_count: Pages
         projects_count: Projects
         proposals_count: Proposals
@@ -111,8 +118,6 @@ en:
           take_part: Take part
         index:
           promoted_assemblies: Highlighted assemblies
-        no_assemblies_yet:
-          no_assemblies_yet: No assemblies yet!
         order_by_assemblies:
           assemblies:
             one: "%{count} assembly"

data/config/locales/es.yml

@@ -79,6 +79,13 @@ es:
       titles:
         assemblies: Asambleas
     assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta asamblea. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta asamblea. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
       index:
         title: Asambleas
       show:
@@ -111,8 +118,6 @@ es:
           take_part: Participa
         index:
           promoted_assemblies: Asambleas destacadas
-        no_assemblies_yet:
-          no_assemblies_yet: "¡Todavía no hay asambleas!"
         order_by_assemblies:
           assemblies:
             one: "%{count} asamblea"

data/config/locales/eu.yml

@@ -3,9 +3,9 @@ eu:
     attributes:
       assembly:
         banner_image: Bannerra
-        copy_categories: Kategoriak kopiatu
-        copy_features: Ezaugarriak kopiatu
-        description: Descripción
+        copy_categories: Kopiatu kategoriak
+        copy_features: Kopiatu funtzionalitateak
+        description: Deskribapena
         developer_group: Talde sustatzailea
         domain: Domeinua
         hashtag: Traola
@@ -16,20 +16,20 @@ eu:
         participatory_structure: Partehartze egitura
         promoted: Nabarmendua
         scope_id: Esparrua
-        scopes_enabled: Esparruak gaituta
+        scopes_enabled: Esparru gaituak
         short_description: Deskribapen laburra
         slug: URL laburra
         subtitle: Azpititulua
         target: Nori zuzentzen zaio?
-        title: Titulua
+        title: Prozesu partizipatiboen multzoak
   decidim:
     admin:
       assemblies:
         create:
-          error: Errore bat gertatu da muntaia berri bat sortzean.
-          success: Batzarra ondo sortu da.
+          error: Errorea gertatu da batzar berri bat sortzean.
+          success: Batzarra zuzen sortu da.
         destroy:
-          success: Batzarak arrakastaz suntsitu zuen.
+          success: Batzarra zuzen ezabatu da.
         edit:
           update: Eguneratu
         form:
@@ -41,24 +41,24 @@ eu:
           create: Sortu
           title: Batzar berria
         update:
-          error: Errore bat gertatu da muntaia hau eguneratzean.
-          success: Batzarra arrakastaz eguneratu da.
+          error: Errorea gertatu da batzar hau eguneratzean.
+          success: Batzarra zuzen eguneratu da.
       assemblies_copies:
         create:
-          error: Errore bat gertatu da muntaia hau bikoizteko.
-          success: Batzar bikoiztu egin da.
+          error: Errorea gertatu da batzar hau kopiatzean.
+          success: Batzarra zuzen bikoiztu da.
       assembly_copies:
         new:
-          copy: Copy
+          copy: Kopiatu
           select: Aukeratu itzazu kopiatu nahi dituzun datuak
-          title: Batzar bikoitza
+          title: Kopiatu batzarra
       assembly_publications:
         create:
-          error: Errore bat gertatu da muntaia hau argitaratzean.
-          success: Batzar ondo argitaratua.
+          error: Errorea gertatu da batzar hau bikoiztean.
+          success: Batzarra ongi argitaratu da.
         destroy:
-          error: Errore bat gertatu da muntatze hau argitaratzea.
-          success: Batzar ez da argitaratu.
+          error: Errorea gertatu da batzar hau desargitaratzean.
+          success: Batzarra ongi desargitaratu da.
       menu:
         assemblies: Biltzarrak
         assemblies_submenu:
@@ -66,25 +66,32 @@ eu:
           categories: Kategoriak
           features: Funtzionalitateak
           info: Informazioa
-          moderations: ' Salaketak'
+          moderations: Moderazioak
       models:
         assembly:
           fields:
-            created_at: Tan sortua
+            created_at: Sortze-data
             promoted: Nabarmendua
             published: Argitaratua
-            title: Titulua
-          name: Batzar
+            title: Prozesu partizipatiboen multzoak
+          name: Batzarra
       titles:
         assemblies: Biltzarrak
     assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'URL slugs erabiltzen dira muntatze hau adierazten duten URLak sortzeko. Letrak, zenbakiak eta marratxoak soilik onartzen ditu eta letra batekin hasi behar duzu. Adibidea: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'URL slugs erabiltzen dira muntatze hau adierazten duten URLak sortzeko. Letrak, zenbakiak eta marratxoak soilik onartzen ditu eta letra batekin hasi behar duzu. Adibidea: %{url}'
       index:
         title: Biltzarrak
       show:
         developer_group: Talde sustatzailea
         local_area: Udal-alorrak
-        participatory_scope: Partehartze esparrua
-        participatory_structure: Partehartze egitura
+        participatory_scope: Esparru partizipatiboa
+        participatory_structure: Egitura partizipatiboa
         scope: Esparrua
         target: Nori zuzentzen zaio?
       statistics:
@@ -92,15 +99,15 @@ eu:
         assemblies_count: Biltzarrak
         comments_count: Iruzkinak
         headline: Jarduera
-        meetings_count: Topaketa-zerrenda
-        orders_count: Eskariak
+        meetings_count: Topaketak
+        orders_count: Euskarriak
         pages_count: Orriak
         projects_count: Proiektuak
         proposals_count: Proposamenak
         results_count: Emaitzak
         surveys_count: Inkestak
         users_count: Parte-hartzaileak
-        votes_count: Botoak
+        votes_count: Euskarriak
     menu:
       assemblies: Biltzarrak
   layouts:
@@ -109,12 +116,10 @@ eu:
         assembly:
           take_part: Parte hartu
         index:
-          promoted_assemblies: Agerraldi nabarmenak
-        no_assemblies_yet:
-          no_assemblies_yet: Ez dago batzurik oraindik!
+          promoted_assemblies: Batzar nabarmenduak
         order_by_assemblies:
           assemblies:
-            one: "%{count} muntaia"
+            one: "%{count} batzarra"
             other: "%{count} batzarrak"
         promoted_assembly:
           more_info: Informazio gehiago

data/config/locales/fi.yml

@@ -3,7 +3,7 @@ fi:
     attributes:
       assembly:
         banner_image: Bannerikuva
-        copy_categories: Kopioi kategoriat
+        copy_categories: Kopioi aihepiirit
         copy_features: Kopioi toiminnot
         description: Kuvaus
         developer_group: Kehitysryhmä
@@ -14,7 +14,7 @@ fi:
         meta_scope: Kontekstin metadata
         participatory_scope: Osallistumisprosessi
         participatory_structure: Osallistumisprosessin rakenne
-        promoted: Oikeudet korotettu
+        promoted: Korostettu
         scope_id: Konteksti
         scopes_enabled: Kontekstit käytössä
         short_description: Lyhyt kuvaus
@@ -63,7 +63,7 @@ fi:
         assemblies: osat
         assemblies_submenu:
           attachments: Liitteet
-          categories: Kategoriat
+          categories: Aihepiirit
           features: Ominaisuudet
           info: Tiedot
           moderations: Moderoinnit
@@ -78,6 +78,13 @@ fi:
       titles:
         assemblies: osat
     assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'URL-osoittimia käytetään tuottamaan tämän kokoonpanon osoittavat URL-osoitteet. Hyväksyy vain kirjeet, numerot ja viivat, ja se on aloitettava kirjaimella. Esimerkki: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'URL-osoittimia käytetään tuottamaan tämän kokoonpanon osoittavat URL-osoitteet. Hyväksyy vain kirjeet, numerot ja viivat, ja se on aloitettava kirjaimella. Esimerkki: %{url}'
       index:
         title: osat
       show:
@@ -91,9 +98,9 @@ fi:
         answers_count: Vastaukset
         assemblies_count: osat
         comments_count: Kommentit
-        headline: Tapahtumat
+        headline: Tilastot
         meetings_count: Tapaamiset
-        orders_count: Tilaukset
+        orders_count: Äänet
         pages_count: Sivut
         projects_count: Projektit
         proposals_count: Ehdotukset
@@ -110,8 +117,6 @@ fi:
           take_part: Osallistu
         index:
           promoted_assemblies: Korostetut kokoonpanot
-        no_assemblies_yet:
-          no_assemblies_yet: Ei kokoonpanoja vielä!
         order_by_assemblies:
           assemblies:
             one: "%{count} kokoonpano"

data/config/locales/fr.yml

@@ -78,6 +78,13 @@ fr:
       titles:
         assemblies: Assemblées
     assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'Les identifiants d''URL sont utilisés pour générer les URL qui envoient vers cette assemblée. N''accepte que des lettres, des chiffres et des tirets et doit commencer par une lettre. Exemple: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'Les identifiants d''URL sont utilisés pour générer les URL qui envoient vers cette assemblée. N''accepte que des lettres, des chiffres et des tirets et doit commencer par une lettre. Exemple: %{url}'
       index:
         title: Assemblées
       show:
@@ -93,7 +100,7 @@ fr:
         comments_count: Commentaires
         headline: Activité
         meetings_count: Réunions
-        orders_count: Ordres
+        orders_count: Votes
         pages_count: Pages
         projects_count: Projets
         proposals_count: Propositions
@@ -110,8 +117,6 @@ fr:
           take_part: Participer
         index:
           promoted_assemblies: Assemblées mises en avant
-        no_assemblies_yet:
-          no_assemblies_yet: Aucune assemblée n'a été créée pour le moment !
         order_by_assemblies:
           assemblies:
             one: "%{count} assemblée"

data/config/locales/it.yml

@@ -78,6 +78,13 @@ it:
       titles:
         assemblies: assemblee
     assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'Gli slug URL vengono utilizzati per generare gli URL che puntano a questo assembly. Accetta solo lettere, numeri e trattini, e deve iniziare con una lettera. Esempio: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'Gli slug URL vengono utilizzati per generare gli URL che puntano a questo assembly. Accetta solo lettere, numeri e trattini, e deve iniziare con una lettera. Esempio: %{url}'
       index:
         title: assemblee
       show:
@@ -93,7 +100,7 @@ it:
         comments_count: Commenti
         headline: Attività
         meetings_count: Riunioni
-        orders_count: Ordini
+        orders_count: Voti
         pages_count: Pagine
         projects_count: Progetti
         proposals_count: Proposte
@@ -110,8 +117,6 @@ it:
           take_part: Partecipa
         index:
           promoted_assemblies: Assiemi evidenziati
-        no_assemblies_yet:
-          no_assemblies_yet: Nessun assemblee ancora!
         order_by_assemblies:
           assemblies:
             one: "%{count} montaggio"

data/config/locales/nl.yml

@@ -78,6 +78,13 @@ nl:
       titles:
         assemblies: Assemblies
     assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'URL-slakjes worden gebruikt om de URL''s die naar dit assemblage wijzen, te genereren. Aanvaardt alleen letters, cijfers en streepjes, en moet beginnen met een brief. Voorbeeld: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'URL-slakjes worden gebruikt om de URL''s die naar dit assemblage wijzen, te genereren. Aanvaardt alleen letters, cijfers en streepjes, en moet beginnen met een brief. Voorbeeld: %{url}'
       index:
         title: Assemblies
       show:
@@ -93,7 +100,7 @@ nl:
         comments_count: Comments
         headline: Activiteit
         meetings_count: Vergaderingen
-        orders_count: bestellingen
+        orders_count: stemmen
         pages_count: Pages
         projects_count: Projecten
         proposals_count: Voorstellen
@@ -110,8 +117,6 @@ nl:
           take_part: Deelnemen
         index:
           promoted_assemblies: Uitgelichte samenstellingen
-        no_assemblies_yet:
-          no_assemblies_yet: Nog geen vergaderingen!
         order_by_assemblies:
           assemblies:
             one: "%{count} assemblage"

data/config/locales/pl.yml

@@ -78,6 +78,13 @@ pl:
       titles:
         assemblies: Zespoły
     assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'Ślimaki URL służą do generowania adresów URL wskazujących ten zespół. Akceptuje tylko litery, cyfry i myślniki i musi zaczynać się od litery. Przykład: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'Ślimaki URL służą do generowania adresów URL wskazujących ten zespół. Akceptuje tylko litery, cyfry i myślniki i musi zaczynać się od litery. Przykład: %{url}'
       index:
         title: Zespoły
       show:
@@ -93,7 +100,7 @@ pl:
         comments_count: Komentarze
         headline: Czynność
         meetings_count: Spotkania
-        orders_count: Święcenia
+        orders_count: Głosowania
         pages_count: Strony
         projects_count: Projekty
         proposals_count: Propozycje
@@ -110,8 +117,6 @@ pl:
           take_part: Wziąć udział
         index:
           promoted_assemblies: Podświetlone zespoły
-        no_assemblies_yet:
-          no_assemblies_yet: Żadne zespoły!
         order_by_assemblies:
           assemblies:
             one: "%{count} montaż"

data/config/locales/ru.yml

@@ -0,0 +1,134 @@
+ru:
+  activemodel:
+    attributes:
+      assembly:
+        banner_image: Изображение баннера
+        copy_categories: Скопировать категории
+        copy_features: Копировать составляющие
+        description: Описание
+        developer_group: Группа разработчиков
+        domain: Домен
+        hashtag: Хэштег
+        hero_image: Изображение главной страницы
+        local_area: Местность
+        meta_scope: Метаданные охвата
+        participatory_scope: Охват соучастия
+        participatory_structure: Структура соучастия
+        promoted: Рекламируется
+        scope_id: Охват
+        scopes_enabled: Охваты включены
+        short_description: Краткое описание
+        slug: Сокращенный URL-адрес
+        subtitle: Подзаголовок
+        target: Цель
+        title: Название
+  decidim:
+    admin:
+      assemblies:
+        create:
+          error: При добавлении нового собрания произошла ошибка.
+          success: Собрание успешно добавлено.
+        destroy:
+          success: Собрание успешно удалено.
+        edit:
+          update: Обновить
+        form:
+          title: Общая информация
+        index:
+          not_published: Не опубликовано
+          published: Опубликовано
+        new:
+          create: Добавить
+          title: Новое собрание
+        update:
+          error: При обновлении этого собрания произошла ошибка.
+          success: Собрание успешно обновлено.
+      assemblies_copies:
+        create:
+          error: При создании копии этого собрания произошла ошибка.
+          success: Успешно создана копия собрания.
+      assembly_copies:
+        new:
+          copy: Копировать
+          select: Выберите, какие данные вы хотите продублировать
+          title: Создать копию собрания
+      assembly_publications:
+        create:
+          error: При публикации этого собрания произошла ошибка.
+          success: Собрание успешно опубликовано.
+        destroy:
+          error: При отмене публикации этого собрания произошла ошибка.
+          success: Публикация собрания успешно отменена.
+      menu:
+        assemblies: Собрания
+        assemblies_submenu:
+          attachments: Вложения
+          categories: Категории
+          features: Составляющие
+          info: Информация
+          moderations: Действия по модерации
+      models:
+        assembly:
+          fields:
+            created_at: 'Добавлено:'
+            promoted: Выдвинутые на первый план
+            published: Опубликовано
+            title: Название
+          name: Собрание
+      titles:
+        assemblies: Собрания
+    assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'Сокращенные URL-адреса используются для создания ссылок на это собрание. В них допустимы только буквы, цифры и тире, и они должны начинаться с буквы. Пример: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'Сокращенные URL-адреса используются для создания ссылок на это собрание. В них допустимы только буквы, цифры и тире, и они должны начинаться с буквы. Пример: %{url}'
+      index:
+        title: Собрания
+      show:
+        developer_group: Группа разработчиков
+        local_area: Местность
+        participatory_scope: Охват соучастия
+        participatory_structure: Структура соучастия
+        scope: Охват
+        target: Цель
+      statistics:
+        answers_count: Ответы
+        assemblies_count: Собрания
+        comments_count: Комментарии
+        headline: Деятельность
+        meetings_count: Встречи
+        orders_count: Голоса
+        pages_count: Страницы
+        projects_count: Проекты
+        proposals_count: Предложения
+        results_count: Итоги
+        surveys_count: Опросы
+        users_count: Участники
+        votes_count: Голоса
+    menu:
+      assemblies: Собрания
+  layouts:
+    decidim:
+      assemblies:
+        assembly:
+          take_part: Принять участие
+        index:
+          promoted_assemblies: Выдвинутые на первый план собрания
+        order_by_assemblies:
+          assemblies:
+            one: "%{count} собрание"
+            few: "%{count} собрания"
+            many: "%{count} собраний"
+            other: "%{count} собраний"
+        promoted_assembly:
+          more_info: Дополнительные сведения
+          take_part: Принять участие
+      assembly_header:
+        assembly_menu_item: Собрание
+        unfold: Развернуть
+      assembly_widgets:
+        show:
+          take_part: Принять участие

data/config/locales/uk.yml

@@ -14,7 +14,7 @@ uk:
         meta_scope: Метадані терену
         participatory_scope: Терен співучасті
         participatory_structure: Структура співучасті
-        promoted: Підвищено в статусі
+        promoted: Рекламується
         scope_id: Терен
         scopes_enabled: Ввімкнені терени
         short_description: Стислий опис
@@ -27,7 +27,7 @@ uk:
       assemblies:
         create:
           error: При створенні нових зборів сталася помилка.
-          success: Збори успішно створено.
+          success: Збори успішно додано.
         destroy:
           success: Збори успішно видалено.
         edit:
@@ -38,7 +38,7 @@ uk:
           not_published: Не опубліковано
           published: Опубліковано
         new:
-          create: Створити
+          create: Додати
           title: Нові збори
         update:
           error: При оновленні цих зборів сталася помилка.
@@ -70,7 +70,7 @@ uk:
       models:
         assembly:
           fields:
-            created_at: 'Створене:'
+            created_at: 'Додано:'
             promoted: Висвітлено
             published: Опубліковано
             title: Назва
@@ -78,6 +78,13 @@ uk:
       titles:
         assemblies: Збори
     assemblies:
+      admin:
+        assemblies:
+          form:
+            slug_help: 'Cкорочені URL-адреси використовуються для створення посилань на ці збори. В них припустимі лише букви, цифри та тире, і вони мають починатися з букви. Приклад: %{url}'
+        assembly_copies:
+          form:
+            slug_help: 'Cкорочені URL-адреси використовуються для створення посилань на ці збори. В них припустимі лише букви, цифри та тире, і вони мають починатися з букви. Приклад: %{url}'
       index:
         title: Збори
       show:
@@ -110,8 +117,6 @@ uk:
           take_part: Взяти участь
         index:
           promoted_assemblies: Висвітлені збори
-        no_assemblies_yet:
-          no_assemblies_yet: Ще немає зборів!
         order_by_assemblies:
           assemblies:
             one: "%{count} (одні) збори"

data/lib/decidim/assemblies/admin_engine.rb

@@ -14,14 +14,14 @@ module Decidim
       paths["db/migrate"] = nil
 
       routes do
-        resources :assemblies do
+        resources :assemblies, param: :slug, except: :show do
           resource :publish, controller: "assembly_publications", only: [:create, :destroy]
           resources :copies, controller: "assembly_copies", only: [:new, :create]
 
           resources :attachments, controller: "assembly_attachments"
         end
 
-        scope "/assemblies/:assembly_id" do
+        scope "/assemblies/:assembly_slug" do
           resources :categories
 
           resources :features do
@@ -41,7 +41,7 @@ module Decidim
           end
         end
 
-        scope "/assemblies/:assembly_id/features/:feature_id/manage" do
+        scope "/assemblies/:assembly_slug/features/:feature_id/manage" do
           Decidim.feature_manifests.each do |manifest|
             next unless manifest.admin_engine
 

data/lib/decidim/assemblies/engine.rb

@@ -12,11 +12,21 @@ module Decidim
       isolate_namespace Decidim::Assemblies
 
       routes do
-        resources :assemblies, only: [:index, :show], path: "assemblies" do
+        get "assemblies/:assembly_id", to: redirect { |params, _request|
+          assembly = Decidim::Assembly.find(params[:assembly_id])
+          assembly ? "/assemblies/#{assembly.slug}" : "/404"
+        }, constraints: { assembly_id: /[0-9]+/ }
+
+        get "/assemblies/:assembly_id/f/:feature_id", to: redirect { |params, _request|
+          assembly = Decidim::Assembly.find(params[:assembly_id])
+          assembly ? "/assemblies/#{assembly.slug}/f/#{params[:feature_id]}" : "/404"
+        }, constraints: { assembly_id: /[0-9]+/ }
+
+        resources :assemblies, only: [:index, :show], param: :slug, path: "assemblies" do
           resource :assembly_widget, only: :show, path: "embed"
         end
 
-        scope "/assemblies/:assembly_id/f/:feature_id" do
+        scope "/assemblies/:assembly_slug/f/:feature_id" do
           Decidim.feature_manifests.each do |manifest|
             next unless manifest.engine
 
@@ -45,6 +55,7 @@ module Decidim
           menu.item I18n.t("menu.assemblies", scope: "decidim"),
                     decidim_assemblies.assemblies_path,
                     position: 2.5,
+                    if: Decidim::Assembly.where(organization: current_organization).published.any?,
                     active: :inclusive
         end
       end

data/lib/decidim/assemblies/participatory_space.rb

@@ -10,8 +10,8 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
     organization = Decidim::Organization.first
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
 
-    3.times do
-      Decidim::Assembly.create!(
+    2.times do
+      assembly = Decidim::Assembly.create!(
         title: Decidim::Faker::Localized.sentence(5),
         slug: Faker::Internet.unique.slug(nil, "-"),
         subtitle: Decidim::Faker::Localized.sentence(2),
@@ -35,9 +35,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         participatory_structure: Decidim::Faker::Localized.sentence(2),
         scope: Faker::Boolean.boolean(0.5) ? nil : Decidim::Scope.reorder("RANDOM()").first
       )
-    end
 
-    Decidim::Assembly.find_each do |assembly|
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.sentence(5),

data/lib/decidim/assemblies/version.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This holds the decidim-assemblies version.
+  module Assemblies
+    def self.version
+      "0.7.0"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,56 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
 description: Assemblies plugin for decidim
 email:
 - josepjaume@gmail.com
@@ -129,7 +115,6 @@ files:
 - app/views/decidim/assemblies/admin/assemblies/new.html.erb
 - app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb
 - app/views/decidim/assemblies/admin/assembly_copies/new.html.erb
-- app/views/decidim/assemblies/assemblies/_no_assemblies_yet.html.erb
 - app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb
 - app/views/decidim/assemblies/assemblies/_statistics.html.erb
 - app/views/decidim/assemblies/assemblies/index.html.erb
@@ -148,6 +133,7 @@ files:
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
+- config/locales/ru.yml
 - config/locales/uk.yml
 - db/migrate/20170727190859_add_assemblies.rb
 - db/migrate/20170822153055_add_scopes_enabled_to_assemblies.rb
@@ -161,9 +147,10 @@ files:
 - lib/decidim/assemblies/engine.rb
 - lib/decidim/assemblies/participatory_space.rb
 - lib/decidim/assemblies/test/factories.rb
+- lib/decidim/assemblies/version.rb
 homepage: https://github.com/decidim/decidim
 licenses:
-- AGPLv3
+- AGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -181,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Assemblies plugin for decidim

data/app/views/decidim/assemblies/assemblies/_no_assemblies_yet.html.erb

@@ -1,3 +0,0 @@
-<div class="column">
-  <p><%= t("assemblies.no_assemblies_yet.no_assemblies_yet", scope: "layouts.decidim") %></p>
-</div>