brightcontent-core 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a59c7387cca9c17d2cdd1a2172f14732fac39181
-  data.tar.gz: b35f502da97a126b6f1dd2d5553564bbcec67149
+  metadata.gz: 2c895a80f6aef94f097927e50b683a0d8e6bee74
+  data.tar.gz: 7151460efa15b166b6e215f350b33bdc4561c41b
 SHA512:
-  metadata.gz: e51652e0b7c53f62e023f2c01fda8ddddf55d30e43feaa8ae2d29d710c703e3696deac162132dc18c7377762df3e6bcc46402d214a59edef3ec3698a054f7ca3
-  data.tar.gz: b4fa46b6fc1c9331ad112831e0ed4c2a00182c537b940fc5df6de05f4f1b56dc5fb5f04293913a953d67bb0df61a28f673a01fca08dafc30c79dc3f467c90cc5
+  metadata.gz: 03f1a3566baf1f60c8b694c57a14310bd11e7f7bc1fc0b7a3abbfe2d6b50dddeabd62f0a48cdb3e1897f08aa99fb9c09b170a2db6003c322b3240537d9640198
+  data.tar.gz: f8ae058fb2c666e140b8149e842a757a30ea09233463a0f34ae6ce575877a69c77c4af5a9c8efc3592b564f8827311e6dcf82d11a4c546b15ea3b9b3b2b6b865

data/app/assets/javascripts/brightcontent/core.js

@@ -17,6 +17,6 @@ $(function() {
     }
   });
 
-  $('[data-behaviour~=datepicker]').datetimepicker(pickTime: false, language: 'nl')
-  $('[data-behaviour~=datetimepicker]').datetimepicker(language: 'nl')
+  $('[data-behaviour~=datepicker]').datetimepicker({ pickTime: false, language: 'nl' })
+  $('[data-behaviour~=datetimepicker]').datetimepicker({ language: 'nl' })
 });

data/lib/brightcontent/base_controller_ext/default_actions.rb

@@ -7,7 +7,7 @@ module Brightcontent
 
       included do
         before_action :set_collection
-        before_action :set_resource, only: [:show, :edit, :update, :destroy]
+        before_action :set_resource
         helper_method :resource, :resource_class, :resource_index_path, :resource_path, :collection, :resource_edit_path
       end
 
@@ -36,11 +36,15 @@ module Brightcontent
       end
 
       def resource_name
-        controller_name
+        resource_class.model_name.plural
       end
 
       def resource_instance_name
-        resource_name.singularize
+        resource_class.model_name.singular
+      end
+
+      def resource_human_name(options = {})
+        resource_class.model_name.human(options)
       end
 
       def index
@@ -60,7 +64,7 @@ module Brightcontent
       def create
         self.resource = base_collection.new(resource_params)
         if resource.save
-          redirect_to resource_redirect_path, notice: t("flash.actions.create.notice", resource_name: resource_instance_name.capitalize)
+          redirect_to resource_redirect_path, notice: t("flash.actions.create.notice", resource_name: resource_human_name)
         else
           render :new
         end
@@ -68,7 +72,7 @@ module Brightcontent
 
       def update
         if resource.update(resource_params)
-          redirect_to resource_redirect_path, notice: t("flash.actions.update.notice", resource_name: resource_instance_name.capitalize)
+          redirect_to resource_redirect_path, notice: t("flash.actions.update.notice", resource_name: resource_human_name)
         else
           render :edit
         end
@@ -76,9 +80,9 @@ module Brightcontent
 
       def destroy
         if resource.destroy
-          redirect_to resource_index_path, notice: t("flash.actions.destroy.notice", resource_name: resource_instance_name.capitalize)
+          redirect_to resource_index_path, notice: t("flash.actions.destroy.notice", resource_name: resource_human_name)
         else
-          redirect_to resource_index_path, alert: t("flash.actions.destroy.alert", resource_name: resource_instance_name.capitalize)
+          redirect_to resource_index_path, alert: t("flash.actions.destroy.alert", resource_name: resource_human_name)
         end
       end
 
@@ -89,7 +93,7 @@ module Brightcontent
       end
 
       def set_resource
-        self.resource = base_collection.find(params[:id])
+        self.resource = base_collection.find(params[:id]) if params[:id].present?
       end
 
       def resource_params

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails