decidim-core 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e4b88a2a26f466db5e822152586aad3206415e1
-  data.tar.gz: 741277dfe657952f64342c07edbc71fad3457053
+  metadata.gz: 57b7690831d061951bff19709653676583f7ef7e
+  data.tar.gz: 24e3aa8fbbc19862a9891cb7f501430e98a3ab4c
 SHA512:
-  metadata.gz: d361b7c1a7d0ff0612f37046d2893dd5fc02fbc98ff42b57fd08a12d6d7cc6b9fe445f86ec62f913bc501a8aa2968e368efce41cec796a524336ab38b35d974a
-  data.tar.gz: fa050d48ed48265c60d141378133eb8b2fa0fe5d903f3114acee96a9e6371787b371f947c5ce5f93c692e5cdaaae40c9ac85b26a22b9a1e24076c3f7992a2c78
+  metadata.gz: dfeedbe421c2b4a64b1e2870e9b5f51f8c981cc57c38b9aa26b0399ad8e0abebadb7fc5ad60c8ca4496dbf1f72433631b1abe4fc0ed9d0dc01f06feb8d3890f3
+  data.tar.gz: 1c8fe1ffcef6c25e84c40e88c472303ffc026166716cceb766392296353aee3ecbb54e208c8413e2e16f64b98aa68a3a4059a5854d561449ad6e6f6f06067b5a

data/app/controllers/decidim/messaging/conversations_controller.rb

@@ -4,8 +4,10 @@ module Decidim
   module Messaging
     # The controller to handle the user's conversations.
     class ConversationsController < Decidim::ApplicationController
+      include ConversationHelper
       include FormFactory
 
+      helper ConversationHelper
       helper Decidim::DatetimeHelper
 
       before_action :authenticate_user!
@@ -14,8 +16,11 @@ module Decidim
 
       def new
         authorize! :create, Conversation
-
         @form = form(ConversationForm).from_params(params)
+
+        conversation = conversation_between(current_user, @form.recipient)
+
+        redirect_to conversation_path(conversation) if conversation
       end
 
       def create

data/app/helpers/decidim/messaging/conversation_helper.rb

@@ -21,16 +21,20 @@ module Decidim
       def link_to_current_or_new_conversation_with(user)
         return decidim.new_user_session_path unless user_signed_in?
 
-        conversation_between = UserConversations.for(current_user).find do |conversation|
-          conversation.participants.to_set == [current_user, user].to_set
-        end
+        conversation = conversation_between(current_user, user)
 
-        if conversation_between
-          decidim.conversation_path(conversation_between)
+        if conversation
+          decidim.conversation_path(conversation)
         else
           decidim.new_conversation_path(recipient_id: user.id)
         end
       end
+
+      def conversation_between(one_user, another_user)
+        UserConversations.for(one_user).find do |conversation|
+          conversation.participants.to_set == [one_user, another_user].to_set
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,6 @@
 <li><%= link_to t(".profile"), decidim.account_path %></li>
 <li><%= link_to t(".notifications"), decidim.notifications_path %></li>
+<li><%= link_to t(".conversations"), decidim.conversations_path %></li>
 <% if can? :read, :admin_dashboard %>
   <li><%= link_to t(".admin_dashboard"), decidim_admin.root_path %></li>
 <% end %>

data/config/locales/ca.yml

@@ -351,6 +351,7 @@ ca:
         title: Notificacions
       user_menu:
         admin_dashboard: Tauler d'administració
+        conversations: Converses
         notifications: Notificacions
         profile: El meu compte
         sign_out: Surt

data/config/locales/en.yml

@@ -349,6 +349,7 @@ en:
         title: Notifications
       user_menu:
         admin_dashboard: Admin dashboard
+        conversations: Conversations
         notifications: Notifications
         profile: My account
         sign_out: Sign out

data/config/locales/es.yml

@@ -349,6 +349,7 @@ es:
         title: Notificaciones
       user_menu:
         admin_dashboard: Tablero de administración
+        conversations: Conversaciones
         notifications: Notificaciones
         profile: Mi cuenta
         sign_out: Sal

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.8.2"
+      "0.8.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -508,28 +508,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com