customer_vault 1.2.5 → 1.2.6

data/app/assets/javascripts/customer_vault/application.js

@@ -1 +0,0 @@
-//= require agilidee_commons/tabs_loader

data/app/assets/stylesheets/customer_vault/application.sass

@@ -1,75 +1,40 @@
-@import dorsale/comments
+.customer_vault
+  .individual-icon,
+  .corporation-icon
+    font-size: 275%
 
-.individual-icon,
-.corporation-icon
-  font-size: 275%
-
-.individual,
-.corporation
   h3
     font-size: 100%
     margin: 10px 0
     font-weight: bold
-  
-  
-  p.infos strong
-    @extend .text-muted
-  
-  
-  .actions
-    width: 50%
-    margin: 0
-    padding: 0
-    float: right
-    text-align: right
-    
-    a
-      @extend .btn
-      @extend .btn-default
-      @extend .btn-xs
-      margin: 0 3px
-
-
-
-// TODO : Export to agilidee_commons
-
-.nostyle
-  margin: 0
-  padding: 0
-  border: none
-  outline: none
-  background: none
 
-.fa
-  @extend .fa-fw
 
-.tab-content 
-  border-left: 1px solid #ddd
-  border-right: 1px solid #ddd
-  border-bottom: 1px solid #ddd
-  padding: 10px
-  min-height: 300px
-
-.nav-tabs 
-  margin-bottom: 0
-
-.cadre
-  padding: 5px
-  margin-bottom: 10px
-  
-  background-color: #F5F5F5
-  border: 1px solid #D8D8D8
-  list-style: none
-
-.center 
-  text-align: center
-
-form .actions
-  text-align: center
-  
-  .btn
-    margin: 1em 5px
+  p.infos strong
+    @extend .text-muted
 
-h1
-  @extend .text-muted
-  text-align: center
+  .person.well
+    padding-top: 10px
+    padding-bottom: 10px
+
+    .actions
+      width: 50%
+      margin: 0
+      padding: 0
+      float: right
+      text-align: right
+
+      a
+        @extend .btn
+        @extend .btn-default
+        @extend .btn-xs
+        margin: 0 3px
+
+  .tab-content
+    border-left: 1px solid #ddd
+    border-right: 1px solid #ddd
+    border-bottom: 1px solid #ddd
+    padding: 10px
+    min-height: 300px
+
+  .nav-tabs
+    margin-bottom: 0

data/app/controllers/customer_vault/application_controller.rb

@@ -3,7 +3,11 @@ require "cancan"
 module CustomerVault
   class ApplicationController < ::ApplicationController
     def current_ability
-      @current_ability ||= CustomerVault::Ability.new(nil)
+      @current_ability ||= ::CustomerVault::Ability.new(nil)
     end
+
+    helper Dorsale::ContextHelper
+    helper Dorsale::FormHelper
+    helper Dorsale::TextHelper
   end
 end

data/app/controllers/customer_vault/corporations_controller.rb

@@ -1,9 +1,9 @@
 require_dependency "customer_vault/application_controller"
 
 module CustomerVault
-  class CorporationsController < ApplicationController
+  class CorporationsController < ::CustomerVault::ApplicationController
     helper Dorsale::CommentsHelper
-    
+
     before_action :set_corporation, only: [:show, :edit, :update, :destroy]
 
     def show
@@ -12,20 +12,20 @@ module CustomerVault
 
     def new
       authorize! :create, CustomerVault::Corporation
-      
+
       @corporation = Corporation.new
       @corporation.build_address
     end
 
     def edit
       authorize! :update, @corporation
-      
+
       @corporation.build_address unless @corporation.address
     end
 
     def create
       authorize! :create, CustomerVault::Corporation
-      
+
       @corporation = Corporation.new(corporation_params)
 
       if @corporation.save
@@ -37,7 +37,7 @@ module CustomerVault
 
     def update
       authorize! :update, @corporation
-      
+
       if @corporation.update(corporation_params)
         redirect_to @corporation, notice: 'Corporation was successfully updated.'
       else
@@ -47,13 +47,13 @@ module CustomerVault
 
     def destroy
       authorize! :delete, @corporation
-      
+
       @corporation.destroy
       redirect_to people_url, notice: 'Corporation was successfully destroyed.'
     end
 
     private
-    
+
     def set_corporation
       @corporation = Corporation.find(params[:id])
     end

data/app/controllers/customer_vault/individuals_controller.rb

@@ -1,9 +1,9 @@
 require_dependency "customer_vault/application_controller"
 
 module CustomerVault
-  class IndividualsController < ApplicationController
+  class IndividualsController < ::CustomerVault::ApplicationController
     helper Dorsale::CommentsHelper
-    
+
     before_action :set_individual, only: [:show, :edit, :update, :destroy]
 
     def show
@@ -12,20 +12,20 @@ module CustomerVault
 
     def new
       authorize! :create, CustomerVault::Individual
-      
+
       @individual = Individual.new
       @individual.build_address
     end
 
     def edit
       authorize! :update, @individual
-      
+
       @individual.build_address unless @individual.address
     end
 
     def create
       authorize! :create, CustomerVault::Individual
-      
+
       @individual = Individual.new(individual_params)
 
       if @individual.save
@@ -37,7 +37,7 @@ module CustomerVault
 
     def update
       authorize! :update, @individual
-      
+
       if @individual.update(individual_params)
         redirect_to @individual, notice: 'Individual was successfully updated.'
       else
@@ -47,7 +47,7 @@ module CustomerVault
 
     def destroy
       authorize! :delete, @individual
-      
+
       @individual.destroy
       redirect_to people_url, notice: 'Individual was successfully destroyed.'
     end

data/app/controllers/customer_vault/links_controller.rb

@@ -1,24 +1,24 @@
 require_dependency "customer_vault/application_controller"
 
 module CustomerVault
-  class LinksController < ApplicationController
+  class LinksController < ::CustomerVault::ApplicationController
     before_action :load_linkable, only: [:new, :edit, :create, :update, :destroy]
 
     def new
       authorize! :update, @person
-      
+
       @link = Link.new
     end
 
     def edit
       authorize! :update, @person
-      
+
       @link = Link.find(params[:id])
     end
 
     def create
       authorize! :update, @person
-      
+
       params = link_params
       bob = params[:bob].split("-")
 
@@ -33,7 +33,7 @@ module CustomerVault
 
     def update
       authorize! :update, @person
-      
+
       @link = Link.find(params[:id])
       if @link.update(link_params)
         redirect_to @person, notice: 'Link was successfully updated.'
@@ -44,7 +44,7 @@ module CustomerVault
 
     def destroy
       authorize! :update, @person
-      
+
       Link.find(params[:id]).destroy
       redirect_to @person, notice: 'Individual was successfully destroyed.'
     end

data/app/controllers/customer_vault/people_controller.rb

@@ -2,12 +2,12 @@ require_dependency "customer_vault/application_controller"
 require 'handles_sortable_columns'
 
 module CustomerVault
-  class PeopleController < ApplicationController
+  class PeopleController < ::CustomerVault::ApplicationController
     handles_sortable_columns
-    
+
     def index
       authorize! :list, Person
-      
+
       sorted_people = sortable_column_order do |column, direction|
         case column
         when 'name'
@@ -20,15 +20,15 @@ module CustomerVault
           get_index_people.sort_by(&:name)
         end
       end
-      
+
       @people = Kaminari.paginate_array(sorted_people).page(params[:page]).per(8)
     end
-    
+
     private
-    
+
     def get_index_people
       Individual.search(params[:q]) + Corporation.search(params[:q])
     end
-    
+
   end
 end

data/app/models/customer_vault/ability.rb

@@ -1,6 +1,6 @@
 module CustomerVault
   class Ability
-    include CanCan::Ability
+    include ::CanCan::Ability
 
     def initialize(user)
       # Allow all by default
@@ -8,4 +8,4 @@ module CustomerVault
       can :manage, :all
     end
   end
-end
+end

data/app/models/customer_vault/corporation.rb

@@ -3,10 +3,10 @@ require "dorsale/search"
 module CustomerVault
   class Corporation < Person
     self.table_name = 'customer_vault_corporations'
-    
+
     include Dorsale::Search
-    
+
     validates :name, presence: true
-    
+
   end
 end

data/app/models/customer_vault/individual.rb

@@ -3,15 +3,15 @@ require "dorsale/search"
 module CustomerVault
   class Individual < Person
     self.table_name = 'customer_vault_individuals'
-    
+
     include Dorsale::Search
-    
+
     validates :first_name, presence: true
     validates :last_name,  presence: true
-    
+
     def name
       [self.last_name, self.first_name].join(', ')
     end
-    
+
   end
 end

data/app/models/customer_vault/person.rb

@@ -1,12 +1,12 @@
 module CustomerVault
   class Person < ActiveRecord::Base
     self.abstract_class = true
-    
+
     has_many :comments, class_name: "Dorsale::Comment", as: :commentable
     has_one :address, class_name: 'Dorsale::Address', as: :addressable
     accepts_nested_attributes_for :address, allow_destroy: true
 
-    def self.list 
+    def self.list
       individuals = Individual.all
       corporations = Corporation.all
       return (individuals + corporations)

data/app/views/customer_vault/corporations/_form.html.slim

@@ -3,7 +3,7 @@
   = f.input :email
   = f.input :phone
   = f.input :fax
-  
+
   / Temporaire - A refactoriser
   = f.simple_fields_for :address do |af|
     = af.input :street
@@ -11,5 +11,5 @@
     = af.input :zip
     = af.input :city
     = af.input :country, as: :string
-  
+
   = form_buttons

data/app/views/customer_vault/corporations/_list_details.html.slim

@@ -2,14 +2,14 @@
   .col-md-1.col-xs-2.center
     .corporation-icon = icon :users
     = link_to 'Details', [customer_vault, c], class: "btn btn-success btn-xs"
-  
+
   .col-md-11.col-xs-10
     h3.name
       = c.name
-      
+
       - if defined?(link)
         = render partial: "customer_vault/links/title", locals: {link: link, person: person}
-    
+
     .row
       .col-md-6
         = context_info "Phone", c.phone

data/app/views/customer_vault/corporations/_show_details.html.slim

@@ -2,7 +2,7 @@
   = context_icon :users
   = context_title corporation.name
   = actions_for corporation, url: customer_vault.corporation_path(corporation)
-  
+
   = context_info "E-mail",  corporation.email
   = context_info "Phone",   corporation.phone
   = context_info "Fax",     corporation.fax

data/app/views/customer_vault/corporations/edit.html.slim

@@ -1,19 +1,20 @@
-- content_for :sub_header do
-  ol.breadcrumb
-    li
-      = link_to 'Home', '/'
-    li
-      = link_to 'People', customer_vault.people_path
-    li.active
-      = "Edit #{@corporation.name}"
+.customer_vault
+  - content_for :sub_header do
+    ol.breadcrumb
+      li
+        = link_to 'Home', '/'
+      li
+        = link_to 'People', customer_vault.people_path
+      li.active
+        = "Edit #{@corporation.name}"
 
-- content_for :context do
-  .corporation-context: .context
-    = context_icon :users
-    = context_title "Edit #{@corporation.name}"
+  - content_for :context do
+    .corporation-context: .context
+      = context_icon :users
+      = context_title "Edit #{@corporation.name}"
 
-- content_for :main do
-  .cadre
-    = render "form"
+  - content_for :main do
+    .well
+      = render "form"
 
-= render "agilidee_commons/contextual"
+  = render_contextual