kuppayam 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be6cbb25ee32833e06b3e99c4f554775348d805d
-  data.tar.gz: a84d5028640bc8be933ff4b523d35ebd054717ce
+  metadata.gz: e69a9139652ca636eed6655d900901568623026b
+  data.tar.gz: 517eb8fb1abd67032953e251cf3925b4e0014f27
 SHA512:
-  metadata.gz: a37a44f8feeea1709bd235ce270fc4c9403c6e38619828706a8f1a35b5078db30920d2474af6ab0d77ef2a78aa5f2938bd98e467c77c309326c376f39f22693e
-  data.tar.gz: e536eb62ca62ca2c6d18b2fffb66f56e3e2d67f24761df91a8117ece4bd3bd0d6d576ab0fd3c85bd765eb16ea112b8c162b163afcd8fe41f289783320f3f17ac
+  metadata.gz: 97dae3aad29f27d6070b25f1e69554200db3d2cd654fc69ede851084cbeed4b31aa0aa300e2c79ce1b900f5d2f6a292c5f613156db4c8e050d7b7420472b76ca
+  data.tar.gz: 583a64259243f55c35f18df6476df47eb519f0e74989b6ffa1c697a148d1b6635b0e534297040b375d8554ac1754b7a3d33d141c4b992c9c3873207128e7d29c

data/app/helpers/image_helper.rb

@@ -135,7 +135,7 @@ module ImageHelper
     end
 
     link_to(image_tag, edit_url, :remote => options[:edit_options][:remote]) +
-    content_tag(:div, class: "btn-group btn-group-justified mt-30") do
+    content_tag(:div, class: "btn-group btn-group-justified mt-10") do
       edit_btn + (object.persisted? ? remove_btn : "")
     end
   end

data/app/helpers/resource_helper.rb

@@ -12,7 +12,7 @@ module ResourceHelper
   end
 
   def show
-    @r_object = @resource_options[:class].find_by_id(params[:id])
+    get_resource
     if @r_object
       instance_variable_set("@#{@resource_options[:item_name]}", @r_object)
     else
@@ -28,7 +28,7 @@ module ResourceHelper
   end
 
   def edit
-    @r_object = @resource_options[:class].find_by_id(params[:id])
+    get_resource
     if @r_object
       instance_variable_set("@#{@resource_options[:item_name]}", @r_object)
     else
@@ -45,7 +45,7 @@ module ResourceHelper
   end
 
   def update
-    @r_object = @resource_options[:class].find_by_id(params[:id])
+    get_resource
     if @r_object
       @r_object.assign_attributes(permitted_params)
       instance_variable_set("@#{@resource_options[:item_name]}", @r_object)
@@ -65,7 +65,7 @@ module ResourceHelper
   end
 
   def destroy
-    @r_object = @resource_options[:class].find_by_id(params[:id])
+    get_resource
     if @r_object
       instance_variable_set("@#{@resource_options[:item_name]}", @r_object)
       if @r_object.can_be_deleted?
@@ -95,7 +95,7 @@ module ResourceHelper
   end
 
   def update_status
-    @r_object = @resource_options[:class].find_by_id(params[:id])
+    get_resource
     if @r_object
       instance_variable_set("@#{@resource_options[:item_name]}", @r_object)
       @r_object.update_attribute(:status, params[:status])
@@ -111,7 +111,7 @@ module ResourceHelper
   end
 
   def mark_as_featured
-    @r_object = @resource_options[:class].find_by_id(params[:id])
+    get_resource
     if @r_object
       instance_variable_set("@#{@resource_options[:item_name]}", @r_object)
       @r_object.update_attribute(:featured, true)
@@ -127,7 +127,7 @@ module ResourceHelper
   end
 
   def remove_from_featured
-    @r_object = @resource_options[:class].find_by_id(params[:id])
+    get_resource
     if @r_object
       instance_variable_set("@#{@resource_options[:item_name]}", @r_object)
       @r_object.update_attribute(:featured, false)
@@ -208,6 +208,10 @@ module ResourceHelper
     end
   end
 
+  def get_resource
+    @r_object = @resource_options[:class].find_by_id(params[:id])
+  end
+
   def get_collections
     prepare_query
     @r_objects = @relation.order("created_at desc").page(@current_page).per(@per_page)

data/lib/kuppayam/action_view/form_helper.rb

@@ -198,7 +198,7 @@ module Kuppayam
           object_name: object.class.name.underscore,
           required: true,
           label: foreign_key.to_s.titleize,
-          prompt: true,
+          prompt: "Select",
           editable: true,
           error_class: "has-error",
           form_style: "left-right"
@@ -251,7 +251,7 @@ module Kuppayam
         options.reverse_merge!(
           label: field_name.to_s.titleize,
           param_name: field_name,
-          prompt: true,
+          prompt: "Select",
           error_class: "has-error",
           required: false,
           form_style: "left-right"
@@ -264,9 +264,14 @@ module Kuppayam
           error_class = ""
           error_message = ""
         end
-
+        begin
+          selected = object.send(field_name)
+          selected = options_list.first.last if selected.blank?
+        rescue
+          selected = nil
+        end
         theme_form_group(options[:label], required: options[:required], error_class: error_class, form_style: options[:form_style]) do
-          select_tag(options[:param_name], options_for_select(options_list, :selected => object.send(field_name)), {:prompt=>options[:prompt], :class => 'form-control'}) + error_message
+          select_tag(options[:param_name], options_for_select(options_list, :selected => selected), {:prompt=>options[:prompt], :class => 'form-control'}) + error_message
         end
       end
 

data/lib/kuppayam/version.rb

@@ -1,3 +1,3 @@
 module Kuppayam
-  VERSION = '0.1.22'
+  VERSION = '0.1.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuppayam
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - kpvarma