Merge pull request #487 from coopdevs/develop

sseerrggii · web-flow · commit f3e99f41b811 · 2019-04-04T09:44:35.000+02:00
Release 1.13.0
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -179,6 +179,10 @@ html {
   margin: 14px 0;
   padding: 5px 20px;
 
+  .post__group_label {
+    margin-left: 10px;
+  }
+
   h4 {
     font-weight: bold;
     display: block;
@@ -710,3 +714,9 @@ label[required]::after{
     line-height: 1.6em;
   }
 }
+
+.inline-checkbox {
+  vertical-align: middle;
+  display: inline;
+  margin: 0 !important;
+}
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
@@ -108,7 +108,7 @@ def set_user_id(p)
 
   def post_params
     permitted_fields = [:description, :end_on, :global, :joinable, :permanent,
-                        :start_on, :title, :category_id, :user_id,
+                        :start_on, :title, :category_id, :user_id, :is_group,
                         :publisher_id, :active, tag_list: []]
 
     params.fetch(resource, {}).permit(*permitted_fields).tap do |p|
diff --git a/app/views/shared/_post.html.erb b/app/views/shared/_post.html.erb
@@ -7,6 +7,9 @@
       <div class="panel-heading">
         <h3 class="panel-title">
           <%= post.class.model_name.human %>
+          <% if post.is_group %>
+            <div class="pull-right label label-default"><%= I18n.t("activerecord.attributes.#{post.class.name.downcase}.is_group") %></div>
+          <% end %>
         </h3>
       </div>
       <div class="panel-body">
diff --git a/app/views/shared/_post_form.html.erb b/app/views/shared/_post_form.html.erb
@@ -24,6 +24,10 @@
                  { include_blank: true },
                  class: "form-control" %>
   </div>
+  <div class="form-group">
+    <%= label :post, :is_group, I18n.t("shared.post_form.group_#{post.class.name.downcase}"), required: true %>
+    <%= f.check_box :is_group, class: 'inline-checkbox' %>
+  </div>
   <div class="form-group">
     <%= f.label :tag_list %>
     <%= f.select :tag_list,
diff --git a/app/views/shared/_posts.html.erb b/app/views/shared/_posts.html.erb
@@ -2,6 +2,9 @@
   <div class="post">
     <h4>
       <%= link_to post.title, post %>
+      <% if post.is_group %>
+        <div class="post__group_label label label-default"><%= I18n.t("activerecord.attributes.#{post.class.name.downcase}.is_group") %></div>
+      <% end %>
     </h4>
     <p>
       <%= strip_tags(post.rendered_description.to_html) %>
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
@@ -21,6 +21,10 @@ ca:
       common:
         created_at: Creat
         updated_at: Actualitzat
+      inquiry:
+        is_group: Demanda grupal
+      offer:
+        is_group: Oferta grupal
       organization:
         address: Direcció
         city: Ciutat
@@ -419,6 +423,8 @@ ca:
       delete_reason: Esteu segur d'esborrar aquest comentari?
       movements: Moviments
     post_form:
+      group_inquiry: És una demanda grupal?
+      group_offer: És una oferta grupal?
       you_can_use: Pots fer servir
   simple_form:
     error_notification:
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -34,6 +34,10 @@ en:
         reg_number_seq: User sequence number
         theme: Theme
         updated_at: Updated
+      offer:
+        is_group: Group offer
+      inquiry:
+        is_group: Group inquiry
       post:
         category: Category
         created_at: Created
@@ -419,6 +423,8 @@ en:
       delete_reason: Are you sure to delete this comment?
       movements: Movements
     post_form:
+      group_offer: Is it a group offer?
+      group_inquiry: Is it a group inquiry?
       you_can_use: You can use
   simple_form:
     error_notification:
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -21,6 +21,10 @@ es:
       common:
         created_at: Creado
         updated_at: Actualizado
+      inquiry:
+        is_group: Demanda grupal
+      offer:
+        is_group: Oferta grupal
       organization:
         address: Dirección
         city: Ciudad
@@ -419,6 +423,8 @@ es:
       delete_reason: "¿Está seguro de borrar este comentario?"
       movements: Movimientos
     post_form:
+      group_inquiry: Es una demanda grupal?
+      group_offer: Es una oferta grupal?
       you_can_use: Puedes usar
   simple_form:
     error_notification:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
@@ -21,6 +21,10 @@ eu:
       common:
         created_at: Sortua
         updated_at: Eguneratua
+      inquiry:
+        is_group: 
+      offer:
+        is_group: 
       organization:
         address: Helbidea
         city: Herria
@@ -425,6 +429,8 @@ eu:
       delete_reason: Zihur zaude , azalpen hau ezabatu nahi duzula?
       movements: Mugimenduak
     post_form:
+      group_inquiry: 
+      group_offer: 
       you_can_use: Erabil dezakezu
   simple_form:
     error_notification:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
@@ -21,6 +21,10 @@ gl:
       common:
         created_at: Creado
         updated_at: Actualizado
+      inquiry:
+        is_group: Solicitude grupal
+      offer:
+        is_group: Oferta grupal
       organization:
         address: Dirección
         city: Cidade
@@ -96,8 +100,8 @@ gl:
         one: Comentario
         other: Comentarios
       inquiry:
-        one: Enquisa
-        other: Enquisas
+        one: Demanda
+        other: Demandas
       offer:
         one: Oferta
         other: Ofertas
@@ -137,9 +141,9 @@ gl:
       demographics: Datos demográficos
       global_activity: Actividade global
       inactive_users: Persoas suarias inactivas
-      inquiry_public_link: Consultas de enlace público
+      inquiry_public_link: Demandas de enlace público
       last_login: Último inicio de sesión
-      offer_public_link: Ofrece unha conexión pública
+      offer_public_link: Enlace público a ofertas
       organizations: Organizacións
       reports: Informes
       sign_out: Saír
@@ -316,7 +320,7 @@ gl:
     edit:
       submit: Cambiar consulta
     index:
-      new_inquiry: Nova consulta
+      new_inquiry: Nova Demanda
     new:
       submit: Crear consulta
   layouts:
@@ -394,13 +398,13 @@ gl:
       empower-text-3: O código fonte de TimeOverflow está dispoñible en base a unha licenza de código aberto e pode descargala en %{github_link}
       empower-title: Empoderando os bancos de tempo
       feature-group-1: Xestión de Banco de tempo con funcións de administración
-      feature-group-2: Rede social e banca en liña accesibles polas persoas membros
-      feature-text-1: Creación / eliminación / actualizacións das persoas membros do banco
+      feature-group-2: Rede social e banca en liña accesibles polas persoas usuarias
+      feature-text-1: Creación / eliminación / actualizacións das persoas usuarias do banco
       feature-text-2: Publicación de ofertas e consultas
       feature-text-3: Inclúe controis e xestión da contabilidade
-      feature-text-4: As persoas membros dun Banco de Tempo poden acceder ao sistema e conectarse con outras persoas membros
+      feature-text-4: As persoas usuarias dun Banco de Tempo poden acceder ao sistema e conectarse con outras persoas usuarias
       feature-text-5: Publicación de ofertas e consultas
-      feature-text-6: Pague horas a outras persoas membros
+      feature-text-6: Pague horas a outras persoas usuarias
       impulsem-link: Aumenta o que fas
       subtitle: TimeOverflow é de código aberto, gratuíto e colaborativo
       title: O software deseñado por e para
@@ -419,6 +423,8 @@ gl:
       delete_reason: Estás seguro/a de borrar este comentario?
       movements: Movementos
     post_form:
+      group_inquiry: É unha solicitude grupal?
+      group_offer: É unha oferta grupal?
       you_can_use: Podes usar
   simple_form:
     error_notification:
@@ -452,7 +458,7 @@ gl:
       num_people: "# de persoas"
       unknown: Descoñecido
     statistics_global_activity:
-      bank_activity: Actividade bancaria
+      bank_activity: Actividade do Peto
       end_date: final mm/aaaa
       global_activity: Actividade global
       ini_date: ini mm/aaaa
@@ -512,7 +518,7 @@ gl:
       create: Crea unha nova persoa usuaria
       manage_warning: Vas cambiar privilexios para o usuario/a %{username}
       manage_warning_angular: Vas cambiar privilexios para o usuario/a {{username}}
-      members: Persoas membros
+      members: Persoas usuarias
       user_created: O usuario/a %{uid} %{name} gardouse
     member_card:
       active_ago: Tempo activo %{time}
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
@@ -21,6 +21,10 @@ pt-BR:
       common:
         created_at: Criado
         updated_at: Atualizado
+      inquiry:
+        is_group: 
+      offer:
+        is_group: 
       organization:
         address: Endereço
         city: Cidade
@@ -419,6 +423,8 @@ pt-BR:
       delete_reason: Tem certeza de que quer apagar este comentário?
       movements: Movimentos
     post_form:
+      group_inquiry: 
+      group_offer: 
       you_can_use: Você pode usar
   simple_form:
     error_notification:
diff --git a/db/migrate/20190319121401_add_is_group_to_post.rb b/db/migrate/20190319121401_add_is_group_to_post.rb
@@ -0,0 +1,5 @@
+class AddIsGroupToPost < ActiveRecord::Migration
+  def change
+    add_column :posts, :is_group, :boolean, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181004200104) do
+ActiveRecord::Schema.define(version: 20190319121401) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -146,10 +146,11 @@
     t.boolean  "global"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "tags",                           array: true
+    t.text     "tags",                            array: true
     t.integer  "publisher_id"
     t.integer  "organization_id"
     t.boolean  "active",          default: true
+    t.boolean  "is_group",        default: false
   end
 
   add_index "posts", ["category_id"], name: "index_posts_on_category_id", using: :btree
diff --git a/spec/views/inquiries/show.html.erb_spec.rb b/spec/views/inquiries/show.html.erb_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+RSpec.describe 'inquiries/show' do
+  let(:organization) { Fabricate(:organization) }
+  let(:member) { Fabricate(:member, organization: organization) }
+  let(:inquiry) { Fabricate(:inquiry, user: member.user, organization: organization) }
+  let(:group_inquiry) { Fabricate(:inquiry, user: member.user, organization: organization, is_group: true) }
+  let(:destination_account) { Fabricate(:account) }
+
+
+  context 'when the user is not logged in' do
+    before do
+      allow(view).to receive(:current_user).and_return(nil)
+      allow(view).to receive(:current_organization).and_return(nil)
+    end
+
+    context 'when it is not a group inquiry' do
+      it 'displays a label' do
+        assign :inquiry, inquiry
+        assign :destination_account, destination_account
+        render template: 'inquiries/show'
+
+        expect(rendered).to_not include(I18n.t('activerecord.attributes.inquiry.is_group'))
+      end
+    end
+
+    context 'when it is a group inquiry' do
+      it 'displays a label' do
+        assign :inquiry, group_inquiry
+        assign :destination_account, destination_account
+        render template: 'inquiries/show'
+
+        expect(rendered).to include(I18n.t('activerecord.attributes.inquiry.is_group'))
+      end
+    end
+  end
+end
diff --git a/spec/views/offers/show.html.erb_spec.rb b/spec/views/offers/show.html.erb_spec.rb
@@ -4,6 +4,7 @@
   let(:organization) { Fabricate(:organization) }
   let(:member) { Fabricate(:member, organization: organization) }
   let(:offer) { Fabricate(:offer, user: member.user, organization: organization) }
+  let(:group_offer) { Fabricate(:offer, user: member.user, organization: organization, is_group: true) }
   let(:destination_account) { Fabricate(:account) }
 
   before do
@@ -152,5 +153,25 @@
 
       expect(rendered).to_not include(offer.user.email)
     end
+
+    context 'when it is not a group offer' do
+      it 'displays a label' do
+        assign :offer, offer
+        assign :destination_account, destination_account
+        render template: 'offers/show'
+
+        expect(rendered).to_not include(I18n.t('activerecord.attributes.offer.is_group'))
+      end
+    end
+
+    context 'when it is a group offer' do
+      it 'displays a label' do
+        assign :offer, group_offer
+        assign :destination_account, destination_account
+        render template: 'offers/show'
+
+        expect(rendered).to include(I18n.t('activerecord.attributes.offer.is_group'))
+      end
+    end
   end
 end
