From 60f504c660bd775d691a83d2be40586c57501f27 Mon Sep 17 00:00:00 2001 From: Peng DU Date: Wed, 22 Jun 2016 18:56:45 +0200 Subject: [PATCH] event categoriy is required --- app/assets/javascripts/controllers/admin/events.coffee | 1 + app/assets/templates/events/_form.html.erb | 2 +- app/models/event.rb | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/controllers/admin/events.coffee b/app/assets/javascripts/controllers/admin/events.coffee index ae48804bf..571a1eab0 100644 --- a/app/assets/javascripts/controllers/admin/events.coffee +++ b/app/assets/javascripts/controllers/admin/events.coffee @@ -228,6 +228,7 @@ Application.Controllers.controller "NewEventController", ["$scope", "$state", "$ end_time: new Date() all_day: 'false' recurrence: 'none' + category_ids: [] ## Possible types of recurrences for an event $scope.recurrenceTypes = [ diff --git a/app/assets/templates/events/_form.html.erb b/app/assets/templates/events/_form.html.erb index 43942f913..685ea8172 100644 --- a/app/assets/templates/events/_form.html.erb +++ b/app/assets/templates/events/_form.html.erb @@ -69,7 +69,7 @@ diff --git a/app/models/event.rb b/app/models/event.rb index 8007f6a4e..09a117ee1 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -6,6 +6,7 @@ class Event < ActiveRecord::Base has_many :event_files, as: :viewable, dependent: :destroy accepts_nested_attributes_for :event_files, allow_destroy: true, reject_if: :all_blank has_and_belongs_to_many :categories, join_table: :events_categories + validates :categories, presence: true belongs_to :availability, dependent: :destroy accepts_nested_attributes_for :availability