Refs #6201; Remove short_name from calendars

7 files changed, 8 insertions, 15 deletions

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index cc7570d65..3d88e4910 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -64,13 +64,13 @@ class CalendarsController < ChouetteController
   end
 
   def calendar_params
-    permitted_params = [:id, :name, :short_name, :shared, periods_attributes: [:id, :begin, :end, :_destroy], date_values_attributes: [:id, :value, :_destroy]]
+    permitted_params = [:id, :name, :shared, periods_attributes: [:id, :begin, :end, :_destroy], date_values_attributes: [:id, :value, :_destroy]]
     permitted_params << :shared if policy(Calendar).share?
     params.require(:calendar).permit(*permitted_params)
   end
 
   def sort_column
-    Calendar.column_names.include?(params[:sort]) ? params[:sort] : 'short_name'
+    Calendar.column_names.include?(params[:sort]) ? params[:sort] : 'name'
   end
 
   def sort_direction
diff --git a/app/models/calendar.rb b/app/models/calendar.rb
index 84b569ab4..32eedf9ea 100644
--- a/app/models/calendar.rb
+++ b/app/models/calendar.rb
@@ -12,8 +12,7 @@ class Calendar < ActiveRecord::Base
   belongs_to :organisation
   belongs_to :workgroup
 
-  validates_presence_of :name, :short_name, :organisation, :workgroup
-  validates_uniqueness_of :short_name
+  validates_presence_of :name, :organisation, :workgroup
 
   has_many :time_tables
 
diff --git a/app/views/autocomplete_calendars/autocomplete.rabl b/app/views/autocomplete_calendars/autocomplete.rabl
index 3a7703c53..9a91e1d69 100644
--- a/app/views/autocomplete_calendars/autocomplete.rabl
+++ b/app/views/autocomplete_calendars/autocomplete.rabl
@@ -1,5 +1,5 @@
 collection @calendars, :object_root => false
-attribute :id, :name, :short_name, :shared
+attribute :id, :name, :shared
 
 node :text do |cal|
   "<strong>" + cal.name + " - " + cal.id.to_s + "</strong>"
diff --git a/app/views/calendars/_filters.html.slim b/app/views/calendars/_filters.html.slim
index 8bfe1974e..4d664c358 100644
--- a/app/views/calendars/_filters.html.slim
+++ b/app/views/calendars/_filters.html.slim
@@ -1,7 +1,7 @@
 = search_form_for @q, url: workgroup_calendars_path(@workgroup), builder: SimpleForm::FormBuilder, html: { method: :get, class: 'form form-filter' } do |f|
   .ffg-row
-    .input-group.search_bar class=filter_item_class(params[:q], :name_or_short_name_cont)
-      = f.search_field :name_or_short_name_cont, class: 'form-control', placeholder: 'Indiquez un nom/nom court de calendrier...'
+    .input-group.search_bar class=filter_item_class(params[:q], :name_cont)
+      = f.search_field :name_cont, class: 'form-control', placeholder: 'Indiquez un nom/nom court de calendrier...'
       span.input-group-btn
         button.btn.btn-default#search_btn type='submit'
           span.fa.fa-search
diff --git a/app/views/calendars/_form_simple.html.slim b/app/views/calendars/_form_simple.html.slim
index ba18c765b..1025130fd 100644
--- a/app/views/calendars/_form_simple.html.slim
+++ b/app/views/calendars/_form_simple.html.slim
@@ -4,8 +4,7 @@
       .row
         .col-lg-12
           = f.input :name
-          = f.input :short_name
-
+          
           - if policy(@calendar).share?
             .form-group.has_switch
               = f.label :shared, class: 'col-sm-4 col-xs-5 control-label'
diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim
index 0b58c0c72..d4b84fe82 100644
--- a/app/views/calendars/index.html.slim
+++ b/app/views/calendars/index.html.slim
@@ -20,10 +20,6 @@
                 end \
               ), \
               TableBuilderHelper::Column.new( \
-                key: :short_name, \
-                attribute: 'short_name' \
-              ), \
-              TableBuilderHelper::Column.new( \
                 key: :organisation, \
                 attribute: Proc.new { |c| c.organisation.name } \
               ), \
diff --git a/app/views/calendars/show.html.slim b/app/views/calendars/show.html.slim
index cec4f66a5..fa1ab3b71 100644
--- a/app/views/calendars/show.html.slim
+++ b/app/views/calendars/show.html.slim
@@ -6,8 +6,7 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          { 'Nom court' => resource.try(:short_name),
-            Calendar.human_attribute_name(:shared) => t("#{resource.shared}"),
+          { Calendar.human_attribute_name(:shared) => t("#{resource.shared}"),
             'Organisation' => resource.organisation.name,
             Calendar.human_attribute_name(:dates) =>  resource.dates.collect{|d| l(d, format: :short)}.join(', ').html_safe,
             Calendar.human_attribute_name(:date_ranges) => resource.periods.map{|d| t('validity_range', debut: l(d.begin, format: :short), end: l(d.end, format: :short))}.join('<br>').html_safe }