decidim-meetings 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa74a2104f0372a4d331aa41e88f7367e925bb18291aaf19973c066b93455cd
-  data.tar.gz: 544fd839d77524cb50bd90b87d7c719308d2b7d3079c66b66f0e065a145936f1
+  metadata.gz: 9e68d252396f00c0349451ad1fc9d8b060fb66be5f1c6940a778e3dfa5bbf9d1
+  data.tar.gz: 9b8cf933f00544fea3fb7cbb8961afcf5ec9fea099bf3efcb329d6f88386c388
 SHA512:
-  metadata.gz: ce74d26e92c167569c542742d41d5e010e7ce877776d0c476fff82a0c4c69894438389b4577e5517c883bccb5dedf9c4429163abad2e785ba61d1b9628f3188d
-  data.tar.gz: 05a10d8b203c7e2c1aa55f2c1de219b192e55e3f6427aee0ee4c8067eb50d35d681c66d30e1a5590c81f8be3ac16a7b7fff9228085794c539c3528739481337c
+  metadata.gz: fd546f8b6ce3f8a0d431974d84638102b2196ff7b9f9e91045fedfaad285546eb20f6e8e458c8988bd837d7fb9605ea99dbb83c45b6064b94b8c8ae653de9728
+  data.tar.gz: 206ac13a27ed35a22e9ef8e94bbe1b659a71f3dc0555b213d834c05098f63b50d4368dc822ed8af24e8814a80de92a81db5e3c4f8388e17b336df111f37ff714

data/app/cells/decidim/meetings/content_blocks/upcoming_meetings_cell.rb

@@ -17,6 +17,7 @@ module Decidim
                                  .includes(component: :participatory_space)
                                  .where(component: meeting_components)
                                  .visible_meeting_for(current_user)
+                                 .published
                                  .where("end_time >= ?", Time.current)
                                  .except_withdrawn
                                  .not_hidden

data/app/cells/decidim/meetings/meeting_list_item_cell.rb

@@ -24,7 +24,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path(filter_link_params)
+        resource_locator(model).path
       end
 
       def title

data/app/cells/decidim/meetings/meeting_m_cell.rb

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def description
-        present(model).description(strip_tags: true)
+        present(model).description(strip_tags: true).truncate(120, separator: /\s/)
       end
 
       def badge

data/app/views/decidim/meetings/admin/meetings/_services.html.erb

@@ -19,7 +19,7 @@
         <% end %>
       </div>
 
-      <button class="button add-service"><%= t(".add_service") %></button>
+      <button class="button add-service" type="button"><%= t(".add_service") %></button>
     </div>
   </div>
 </div>

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

@@ -6,9 +6,9 @@
 
 <div class="row columns">
   <div class="title-action">
-    <h3 id="meetings-count" class="title-action__title section-heading">
+    <h2 id="meetings-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
-    </h3>
+    </h2>
 
     <% if allowed_to?(:create, :meeting) %>
       <%= action_authorized_link_to :create, new_meeting_path, class: "title-action__action button small", data: { "redirect_url" => new_meeting_path } do %>

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

@@ -17,7 +17,7 @@ edit_link(
 
 <div class="row column view-header">
   <div class="m-bottom">
-    <%= link_to meetings_path(filter_link_params), class: "small hollow" do %>
+    <%= link_to meetings_path, class: "small hollow js-back-to-list" do %>
       <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
       <%= t(".back") %>
     <% end %>

data/config/locales/ar.yml

@@ -72,6 +72,10 @@ ar:
         other: التسجيلات
   decidim:
     admin:
+      filters:
+        meetings:
+          category_id_eq:
+            label: الفئة
       meeting_copies:
         create:
           error: كانت هناك مشكلة في تكرار هذا الاجتماع.
@@ -299,6 +303,9 @@ ar:
           value_types:
             organizer_presenter:
               not_found: 'لم يتم العثور على المنظم في قاعدة البيانات (المعرف: %{id})'
+      application_helper:
+        filter_category_values:
+          all: الكل
       calendar_modal:
         calendar_url: العنوان الشبكي للتقويم
         close_window: أغلق النافذة
@@ -333,6 +340,8 @@ ar:
           filter: منقي
           filter_by: مصنف بواسطة
           unfold: كشف
+        form:
+          select_a_category: يُرجى اختيار فئة
         meeting_minutes:
           related_information: معلومات ذات صله
         meetings:
@@ -380,6 +389,10 @@ ar:
             map: خريطة
             start_time: تاريخ البدء
             title: عنوان
+      polls:
+        questions:
+          index_admin:
+            results: النتائج
       read_more: "(قراءة المزيد)"
       registration_mailer:
         confirmation:

data/config/locales/ja.yml

@@ -10,7 +10,7 @@ ja:
         attending_organizations: 参加した組織一覧
         audio_url: 音声URL
         closing_report: 議事録
-        closing_visible: 非表示にする
+        closing_visible: 表示する
         contributions_count: 貢献数
         proposal_ids: ミーティングで作成された提案
         video_url: 動画URL

data/lib/decidim/api/linked_resources_interface.rb

@@ -5,7 +5,7 @@ module Decidim
     # This interface represents all linked resources available in the module meetings
     module LinkedResourcesInterface
       include Decidim::Api::Types::BaseInterface
-      graphql_name "MeetinsLinkedResourcewInterface"
+      graphql_name "MeetingsLinkedResourcesInterface"
       description "An interface that can be used with Resourceable models."
 
       if Decidim::Meetings.enable_proposal_linking

data/lib/decidim/api/meeting_type.rb

@@ -11,7 +11,7 @@ module Decidim
       implements Decidim::Core::AttachableInterface
       implements Decidim::Core::TimestampsInterface
       implements Decidim::Meetings::ServicesInterface
-      implements Decidim::Meetings::LinkedResourcesInterface
+      implements Decidim::Meetings::LinkedResourcesInterface if Decidim::Meetings.enable_proposal_linking
       implements Decidim::Forms::QuestionnaireEntityInterface
 
       field :id, GraphQL::Types::ID, "ID of this meeting", null: false

data/lib/decidim/meetings/component.rb

@@ -42,7 +42,6 @@ Decidim.register_component(:meetings) do |component|
   component.exports :meetings do |exports|
     exports.collection do |component_instance|
       Decidim::Meetings::Meeting
-        .published
         .not_hidden
         .visible
         .where(component: component_instance)

data/lib/decidim/meetings/meeting_serializer.rb

@@ -45,7 +45,8 @@ module Decidim
           followers: meeting.follows.size,
           url: url,
           related_proposals: related_proposals,
-          related_results: related_results
+          related_results: related_results,
+          published: meeting.published_at.present?
         }
       end
 

data/lib/decidim/meetings/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.26.0"
+      "0.26.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -60,56 +60,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com