dorsale 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b1e9d0f347103fbdd22f9b4dcf92688e3c4f2dc
-  data.tar.gz: 65ea3dd53a8de8bb9fc4c7769d438a3d63711e22
+  metadata.gz: 523d3264e16c525112422f6ec7beb74c0c28a2e8
+  data.tar.gz: 5018061784efc57024e7787e055bb8f64ed6be2c
 SHA512:
-  metadata.gz: a9d8a3a529b0353e2867e08daea7065d4053c3f9ddc333633a085c9a5b3c6e0068261b009b36fc2aabb0c61fb02e89993cae7334c690cd9117f6f7b1cb815355
-  data.tar.gz: b11827ac3d227f2790eed5693491b0a7b23d62baa6cd344ae0a7fa8ec78e111a7f08318dcfd0433b54e9d83cb4360944ffbf8f71b16c772c24f689b8f58eb9c9
+  metadata.gz: 9497cb875ece483c790e5aae3a5c1661b3e9fade30246d9c9a269ea1239f642056c6898ba981197829eca38263cc9eb9452723a3e849c391e44e0983da0810bb
+  data.tar.gz: 16ecb86b3ad8dd7df1992bc507b091c479657dd4a3172a5ced80e1434051bbadb5b3656f4c3453f38a4ac36894ff488e7c7e34abbe1dfb628f21863bf1b4f8eb

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.7.0
+
+- Remove some useless "polymorphic" belongs_to
+- Add `comment?` action to task policy
+- CustomerVault : origins and activity types
+
 ## 3.6.1
 
 - CSS fix

data/app/controllers/concerns/dorsale/flyboy/tasks_summary_concern.rb

@@ -2,8 +2,7 @@ module Dorsale::Flyboy::TasksSummaryConcern
   extend ActiveSupport::Concern
 
   def setup_tasks_summary
-    tasks = policy_scope(::Dorsale::Flyboy::Task)
-      .where("(owner_id IS NULL and owner_type IS NULL) OR (owner_id = ? and owner_type = ?)", current_user.id, current_user.class)
+    tasks = policy_scope(::Dorsale::Flyboy::Task).where(owner: [current_user, nil])
 
     @delayed_tasks        = tasks.delayed
     @today_tasks          = tasks.today

data/app/controllers/dorsale/customer_vault/activity_types_controller.rb

@@ -0,0 +1,76 @@
+class Dorsale::CustomerVault::ActivityTypesController < ::Dorsale::CustomerVault::ApplicationController
+  before_action :set_objects, only: [:edit, :update]
+
+  def index
+    authorize model, :list?
+
+    @activity_types ||= scope.all
+  end
+
+  def new
+    @activity_type ||= scope.new
+
+    authorize @activity_type, :create?
+  end
+
+  def create
+    @activity_type ||= scope.new(activity_type_params_for_create)
+
+    authorize @activity_type, :create?
+
+    if @activity_type.save
+      flash[:notice] = t("messages.activity_types.create_ok")
+      redirect_to back_url
+    else
+      render action: :new
+    end
+  end
+
+  def edit
+    authorize @activity_type, :update?
+  end
+
+  def update
+    authorize @activity_type, :update?
+
+    if @activity_type.update(activity_type_params_for_update)
+      flash[:notice] = t("messages.activity_types.update_ok")
+      redirect_to back_url
+    else
+      render action: :edit
+    end
+  end
+
+  private
+
+  def set_objects
+    @activity_type ||= scope.find(params[:id])
+  end
+
+  def model
+    ::Dorsale::CustomerVault::ActivityType
+  end
+
+  def back_url
+    customer_vault_activity_types_path
+  end
+
+  def permitted_params
+    [
+      :name,
+    ]
+  end
+
+  def activity_type_params
+    params.fetch(:activity_type, {}).permit(permitted_params)
+  end
+
+  def activity_type_params_for_create
+    activity_type_params
+  end
+
+  def activity_type_params_for_update
+    activity_type_params
+  end
+
+end

data/app/controllers/dorsale/customer_vault/origins_controller.rb

@@ -0,0 +1,76 @@
+class Dorsale::CustomerVault::OriginsController < ::Dorsale::CustomerVault::ApplicationController
+  before_action :set_objects, only: [:edit, :update]
+
+  def index
+    authorize model, :list?
+
+    @origins ||= scope.all
+  end
+
+  def new
+    @origin ||= scope.new
+
+    authorize @origin, :create?
+  end
+
+  def create
+    @origin ||= scope.new(origin_params_for_create)
+
+    authorize @origin, :create?
+
+    if @origin.save
+      flash[:notice] = t("messages.origins.create_ok")
+      redirect_to back_url
+    else
+      render action: :new
+    end
+  end
+
+  def edit
+    authorize @origin, :update?
+  end
+
+  def update
+    authorize @origin, :update?
+
+    if @origin.update(origin_params_for_update)
+      flash[:notice] = t("messages.origins.update_ok")
+      redirect_to back_url
+    else
+      render action: :edit
+    end
+  end
+
+  private
+
+  def set_objects
+    @origin ||= scope.find(params[:id])
+  end
+
+  def model
+    ::Dorsale::CustomerVault::Origin
+  end
+
+  def back_url
+    customer_vault_origins_path
+  end
+
+  def permitted_params
+    [
+      :name,
+    ]
+  end
+
+  def origin_params
+    params.fetch(:origin, {}).permit(permitted_params)
+  end
+
+  def origin_params_for_create
+    origin_params
+  end
+
+  def origin_params_for_update
+    origin_params
+  end
+
+end

data/app/controllers/dorsale/customer_vault/people_controller.rb

@@ -153,6 +153,8 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
       :linkedin,
       :viadeo,
       :context,
+      :origin_id,
+      :activity_type_id,
       :tag_list => [],
       :address_attributes => [
         :street,

data/app/controllers/dorsale/flyboy/task_comments_controller.rb

@@ -5,7 +5,7 @@ class Dorsale::Flyboy::TaskCommentsController < ::Dorsale::Flyboy::ApplicationCo
     @task_comment ||= model.new(task_comment_params_for_create)
     @task         ||= @task_comment.task
 
-    authorize @task, :update?
+    authorize @task, :comment?
 
     if @task_comment.save
       redirect_to @task

data/app/controllers/dorsale/flyboy/tasks_controller.rb

@@ -186,7 +186,7 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
       :reminder_date,
       :reminder_duration,
       :reminder_unit,
-      :owner_guid,
+      :owner_id,
     ]
   end
 

data/app/models/dorsale/alexandrie/attachment.rb

@@ -2,7 +2,7 @@ class Dorsale::Alexandrie::Attachment < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_alexandrie_attachments"
 
   belongs_to :attachable, polymorphic: true
-  belongs_to :sender,     polymorphic: true
+  belongs_to :sender, class_name: User
 
   belongs_to :attachment_type, required: false
 

data/app/models/dorsale/comment.rb

@@ -1,5 +1,5 @@
 class Dorsale::Comment < ::Dorsale::ApplicationRecord
-  belongs_to :author, polymorphic: true
+  belongs_to :author, class_name: User
   belongs_to :commentable, polymorphic: true
 
   validates :author,      presence: true

data/app/models/dorsale/customer_vault/activity_type.rb

@@ -0,0 +1,9 @@
+class Dorsale::CustomerVault::ActivityType < ::Dorsale::ApplicationRecord
+  self.table_name = "dorsale_customer_vault_activity_types"
+
+  validates :name, presence: true
+
+  def to_s
+    name
+  end
+end

data/app/models/dorsale/customer_vault/individual.rb

@@ -14,6 +14,13 @@ class Dorsale::CustomerVault::Individual < Dorsale::CustomerVault::Person
     [self.last_name, self.first_name].join(", ")
   end
 
+  def activity_type
+    corporation.try(:activity_type)
+  end
+
   private def corporation_name;  raise NoMethodError; end
   private def corporation_name=; raise NoMethodError; end
+  private def activity_type=; raise NoMethodError; end
+  private def activity_type_id;  raise NoMethodError; end
+  private def activity_type_id=; raise NoMethodError; end
 end

data/app/models/dorsale/customer_vault/origin.rb

@@ -0,0 +1,9 @@
+class Dorsale::CustomerVault::Origin < ::Dorsale::ApplicationRecord
+  self.table_name = "dorsale_customer_vault_origins"
+
+  validates :name, presence: true
+
+  def to_s
+    name
+  end
+end

data/app/models/dorsale/customer_vault/person.rb

@@ -27,6 +27,9 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   has_many :invoices, class_name: ::Dorsale::BillingMachine::Invoice, as: :customer
   accepts_nested_attributes_for :address, allow_destroy: true
 
+  belongs_to :activity_type, class_name: ::Dorsale::CustomerVault::ActivityType
+  belongs_to :origin, class_name: ::Dorsale::CustomerVault::Origin
+
   after_destroy :destroy_links
 
   default_scope -> {

data/app/models/dorsale/flyboy/task.rb

@@ -9,7 +9,7 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
   paginates_per 50
 
   belongs_to :taskable, polymorphic: true, required: false
-  belongs_to :owner, polymorphic: true
+  belongs_to :owner, class_name: User
   has_many :comments, class_name: ::Dorsale::Flyboy::TaskComment, inverse_of: :task, dependent: :destroy
 
   polymorphic_id_for :taskable

data/app/models/dorsale/flyboy/task_comment.rb

@@ -2,7 +2,7 @@ class Dorsale::Flyboy::TaskComment < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_flyboy_task_comments"
 
   belongs_to :task
-  belongs_to :author, polymorphic: true
+  belongs_to :author, class_name: User
 
   validates :author,      presence: true
   validates :task,        presence: true

data/app/policies/dorsale/customer_vault/activity_type_policy_helper.rb

@@ -0,0 +1,7 @@
+module Dorsale::CustomerVault::ActivityTypePolicyHelper
+  POLICY_METHODS = [
+    :list?,
+    :create?,
+    :update?,
+  ]
+end

data/app/policies/dorsale/customer_vault/origin_policy_helper.rb

@@ -0,0 +1,7 @@
+module Dorsale::CustomerVault::OriginPolicyHelper
+  POLICY_METHODS = [
+    :list?,
+    :create?,
+    :update?,
+  ]
+end

data/app/policies/dorsale/flyboy/task_policy_helper.rb

@@ -4,6 +4,7 @@ module Dorsale::Flyboy::TaskPolicyHelper
     :export?,
     :create?,
     :read?,
+    :comment?,
     :update?,
     :delete?,
     :complete?,

data/app/policies/dorsale/policy_checker.rb

@@ -16,6 +16,8 @@ class Dorsale::PolicyChecker
     check_policy! "Dorsale::CustomerVault::EventPolicy"
     check_policy! "Dorsale::CustomerVault::PersonPolicy"
     check_policy! "Dorsale::CustomerVault::LinkPolicy"
+    check_policy! "Dorsale::CustomerVault::OriginPolicy"
+    check_policy! "Dorsale::CustomerVault::ActivityTypePolicy"
     check_policy! "Dorsale::ExpenseGun::CategoryPolicy"
     check_policy! "Dorsale::ExpenseGun::ExpensePolicy"
     check_policy! "Dorsale::Flyboy::TaskPolicy"

data/app/views/dorsale/customer_vault/activity_types/_form.html.slim

@@ -0,0 +1,13 @@
+.panel.panel-default
+  .panel-heading: .panel-title
+    - if @activity_type.new_record?
+      = t("customer_vault.activity_type.actions.create")
+    - else
+      = t("actions.update")
+      = " : "
+      = @activity_type
+
+  .panel-body
+    = horizontal_form_for @activity_type, as: :activity_type do |f|
+      = f.input :name
+      = form_buttons

data/app/views/dorsale/customer_vault/activity_types/_index_actions.html.slim

@@ -0,0 +1,2 @@
+- if policy(::Dorsale::CustomerVault::ActivityType).create?
+  = create_button new_customer_vault_activity_type_path, action: :create

data/app/views/dorsale/customer_vault/activity_types/_list.html.slim

@@ -0,0 +1,17 @@
+table.table.default#activity_type
+  thead
+    tr
+      th.actions.activity_type-name
+        = ::Dorsale::CustomerVault::ActivityType.t(:name)
+      th.actions.activity_type-action
+        = "Action"
+
+  tbody
+    - @activity_types.each do |activity_type|
+      tr.actions.activity_type
+        td.actions.activity_type-name
+          = activity_type
+
+        td.actions.activity_type-action
+          - if policy(activity_type).create?
+            = update_button edit_customer_vault_activity_type_path(activity_type), id: "edit-#{activity_type.id}"

data/app/views/dorsale/customer_vault/activity_types/edit.html.slim

@@ -0,0 +1 @@
+= render "form"

data/app/views/dorsale/customer_vault/activity_types/index.html.slim

@@ -0,0 +1,11 @@
+.customer_vault
+  - content_for :title
+    = ::Dorsale::CustomerVault::ActivityType.ts
+
+  - content_for :actions
+    = render "dorsale/customer_vault/activity_types/index_actions"
+
+  - content_for :table
+    = render "dorsale/customer_vault/activity_types/list", activity_types: @activity_types
+
+  = render_dorsale_page

data/app/views/dorsale/customer_vault/activity_types/new.html.slim

@@ -0,0 +1 @@
+= render "form"

data/app/views/dorsale/customer_vault/origins/_form.html.slim

@@ -0,0 +1,13 @@
+.panel.panel-default
+  .panel-heading: .panel-title
+    - if @origin.new_record?
+      = t("customer_vault.origin.actions.create")
+    - else
+      = t("actions.update")
+      = " : "
+      = @origin
+
+  .panel-body
+    = horizontal_form_for @origin, as: :origin do |f|
+      = f.input :name
+      = form_buttons

data/app/views/dorsale/customer_vault/origins/_index_actions.html.slim

@@ -0,0 +1,2 @@
+- if policy(::Dorsale::CustomerVault::Origin).create?
+  = create_button new_customer_vault_origin_path, action: :create

data/app/views/dorsale/customer_vault/origins/_list.html.slim

@@ -0,0 +1,17 @@
+table.table.default#origin
+  thead
+    tr
+      th.actions.origin-name
+        = ::Dorsale::CustomerVault::Origin.t(:name)
+      th.actions.origin-action
+        = "Action"
+
+  tbody
+    - @origins.each do |origin|
+      tr.actions.origin
+        td.actions.origin-name
+          = origin
+
+        td.actions.origin-action
+          - if policy(origin).create?
+            = update_button edit_customer_vault_origin_path(origin), id: "edit-#{origin.id}"

data/app/views/dorsale/customer_vault/origins/edit.html.slim

@@ -0,0 +1 @@
+= render "form"

data/app/views/dorsale/customer_vault/origins/index.html.slim

@@ -0,0 +1,11 @@
+.customer_vault
+  - content_for :title
+    = ::Dorsale::CustomerVault::Origin.ts
+
+  - content_for :actions
+    = render "dorsale/customer_vault/origins/index_actions"
+
+  - content_for :table
+    = render "dorsale/customer_vault/origins/list", origins: @origins
+
+  = render_dorsale_page

data/app/views/dorsale/customer_vault/origins/new.html.slim

@@ -0,0 +1 @@
+= render "form"

data/app/views/dorsale/customer_vault/people/_context_general.html.slim

@@ -1,5 +1,7 @@
 .sub-context
   = info person, :tags, tags(person)
+  = info person, :activity_type
+  = info person, :origin
 
   - if person.individual?
     = info person, :corporation, helper: :link_to_object

data/app/views/dorsale/customer_vault/people/_form.html.slim

@@ -11,6 +11,9 @@
 
       = f.input :short_name
       = render "dorsale/forms/avatar", f: f
+      = f.association :origin, collection: policy_scope(Dorsale::CustomerVault::Origin), input_html: {class: 'select2'}
+      - if @person.corporation?
+        = f.association :activity_type, collection: policy_scope(Dorsale::CustomerVault::ActivityType), input_html: {class: 'select2'}
       = f.input :tag_list, collection: @tags, input_html: {multiple: true}
 
   .panel.panel-default

data/app/views/dorsale/flyboy/task_comments/_list.html.slim

@@ -9,12 +9,12 @@
           = Dorsale::Flyboy::TaskComment.t(:description)
 
     tbody
-      - if policy(@task).update?
+      - if policy(@task).comment?
         tr#new_task_comment_tr
           td.task_comment-progress
             = f.input :progress, label: false
 
-          td.task_comment-description
+          td.task_comment-content
             = f.hidden_field :task_id
 
             .textarea-input-group
@@ -23,12 +23,16 @@
 
 
       - @task.reload.comments.map do |comment|
-        tr
+        tr.task_comment
           td.task_comment-progress
             = progress_bar percentage: comment.progress, label: true
 
-          td.task_comment-description
+          td.task_comment-content
             p: small
-              span.date = date(comment.date)
+              span.task_comment-date = date(comment.date)
+              = " "
+              = comment.t(:written_by)
+              = " "
+              span.task_comment-author = comment.author
 
-            p = text2html comment.description
+            p.task_comment-description = text2html comment.description

data/app/views/dorsale/flyboy/tasks/_form.html.slim

@@ -17,7 +17,7 @@
 
       .row
         .col-sm-8 = f.input :name
-        .col-sm-4 = f.input :owner_guid, collection: @owners.map{ |e| [e.to_s, e.guid] }
+        .col-sm-4 = f.input :owner_id, collection: @owners
 
       = f.input :description, input_html: {rows: 5}
       = render "dorsale/flyboy/tasks/term_fields", f: f

data/config/locales/customer_vault.en.yml

@@ -7,6 +7,14 @@ en:
     address_informations: "Address informations"
     additional_informations: "Additional informations"
 
+    origin:
+      actions:
+        create: "New origin"
+
+    activity_type:
+      actions:
+        create: "New activity type"
+
   messages:
     no_people: "No people find."
     no_activity: "No recent activity."
@@ -29,6 +37,14 @@ en:
       delete_ok    : "Link deleted."
       delete_error : "One error occurs, link not deleted."
 
+    origins:
+      create_ok    : "Origin created."
+      update_ok    : "Origin updated."
+
+    activity_types:
+      create_ok    : "Activity created."
+      update_ok    : "Activity updated."
+
   actions:
     new_individual: "New individual"
     new_corporation: "New corporation"
@@ -53,6 +69,13 @@ en:
       dorsale/customer_vault/event:
         one: "Event"
         other: "Events"
+      dorsale/customer_vault/origin:
+        one: "Origin"
+        other: "Origin"
+      dorsale/customer_vault/activity_type:
+        one: "Activity type"
+        other: "Activity types"
+
 
     attributes:
       dorsale/customer_vault/person: &customer_vault_person_attributes
@@ -72,6 +95,9 @@ en:
         person_type: "Type"
         title: "Title"
         individuals: "Individuals"
+        origin: "Origin"
+        activity_type: "Activity type"
+
       dorsale/customer_vault/individual:
         <<: *customer_vault_person_attributes
       dorsale/customer_vault/corporation:

data/config/locales/customer_vault.fr.yml

@@ -7,6 +7,14 @@ fr:
     address_informations: "Adresse"
     additional_informations: "Informations complémentaires"
 
+    origin:
+      actions:
+        create: "Nouvelle origine"
+
+    activity_type:
+      actions:
+        create: "Nouveau type d'activité"
+
   messages:
     no_people: "Aucune personne trouvée."
     no_activity: "Aucune activité récente."
@@ -29,6 +37,14 @@ fr:
       delete_ok    : "Le lien a été supprimé."
       delete_error : "Impossible de supprimer ce lien."
 
+    origins:
+      create_ok    : "L'origine a été créée."
+      update_ok    : "L'origine a été modifiée."
+
+    activity_types:
+      create_ok    : "Le type d'activité a été créé."
+      update_ok    : "Le type d'activité a été modifiée."
+
   actions:
     new_individual: "Nouvel individu"
     new_corporation: "Nouvelle entreprise"
@@ -53,6 +69,12 @@ fr:
       dorsale/customer_vault/event:
         one: "Événement"
         other: "Événements"
+      dorsale/customer_vault/origin:
+        one: "Origine du contact"
+        other: "Origines du contact"
+      dorsale/customer_vault/activity_type:
+        one: "Type d'activité"
+        other: "Type d'activité"
 
     attributes:
       dorsale/customer_vault/person: &customer_vault_person_attributes
@@ -72,6 +94,9 @@ fr:
         person_type: "Type"
         title: "Fonction"
         individuals: "Individus"
+        origin: "Origine"
+        activity_type: "Type d'activité"
+
       dorsale/customer_vault/individual:
         <<: *customer_vault_person_attributes
       dorsale/customer_vault/corporation:

data/config/locales/dorsale.en.yml

@@ -8,12 +8,14 @@ en:
       update_error : "One error occurs, comment can't be updated."
       delete_ok    : "Comment deleted."
       delete_error : "One error occurs, comment can't be deleted."
+
     users:
       inactive: "This account is inactive"
       create_ok    : "User created."
       create_error : "One error occurs, user can't be created."
       update_ok    : "User updated."
       update_error : "One error occurs, user can't be updated."
+
     emails:
       user:
         new_account:

data/config/locales/dorsale.fr.yml

@@ -8,12 +8,14 @@ fr:
       update_error : "Impossible de modifier le commentaire."
       delete_ok    : "Le commentaire a été supprimé."
       delete_error : "Impossible de supprimer le commentaire."
+
     users:
       inactive: "Ce compte est inactif"
       create_ok    : "L'utilisateur a été créé."
       create_error : "Impossible de créer l'utilisateur."
       update_ok    : "L'utilisateur a été modifié."
       update_error : "Impossible de modifier l'utilisateur."
+
   emails:
     user:
       new_account: