rademade_admin 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e967c4945eda7534ef2e9ed32ae11b9686e16dc5
-  data.tar.gz: 68134738ae0f819c71c11abde50944e0b70d1da9
+  metadata.gz: 9b5a2cb3531638de5873ab10f39c9d89b5628d6e
+  data.tar.gz: 377c15c9e31e321d6fac8e2994c2b88acfebe8c3
 SHA512:
-  metadata.gz: 93b797e63ff62a8c46185834188b9108e88e5c8a0a2317e114c021a83535c9b9fa61d012846b0386e5f7cd1e0b869dc8330117aad65a76e1c012d818eb35587c
-  data.tar.gz: c745f46bed20435c396c68d6be3dd3c09d4c4c5493ee4eb603cec0686f1f52efaf8a6da8b7d2feedab2d90329f70e0991b9947e6a36b88abfdaacb7849838f11
+  metadata.gz: 3fbfa9b7ec35b66ea9df3a88bfff40ce06ad34940d935b2768ef33e08b5317292eb702c71ac93085b9bb0be8446dd6cf3a6841cfc4f229fcea40b3541fc3cf67
+  data.tar.gz: 57d1a457a2b782f2626e9fd4f0378cc0d018655b8ebfba0df2fbef067b9b8d1abd3d78eea98f2d57bfcd9a1dae26c3dbbed801690038c59616432f884f9311b0

data/app/cells/menu/item.slim

@@ -1,15 +1,16 @@
-li class=('menu-box' + (@is_active ? ' active' : ''))
+- if @uri
+  li class=('menu-box' + (@is_active ? ' active' : ''))
 
-  .pointer
-    .arrow
-    .arrow_border
+    .pointer
+      .arrow
+      .arrow_border
 
-  a href="#{@uri}" class=('menu-link' + (@has_sub_items ? ' dropdown-toggle' : ''))
-    i(class="#{@ico_class}")
-    span #{@name}
+    a href="#{@uri}" class=('menu-link' + (@has_sub_items ? ' dropdown-toggle' : ''))
+      i(class="#{@ico_class}")
+      span #{@name}
 
-    - if @has_sub_items
-      span.caret
+      - if @has_sub_items
+        span.caret
 
-  - if @has_sub_items
-    =render_cell(:menu, :sub_items, @sub_items)
+    - if @has_sub_items
+      =render_cell(:menu, :sub_items, @sub_items)

data/app/cells/menu/sub_item.slim

@@ -1,4 +1,5 @@
-li class=('menu-box' + (@is_active ? ' active' : ''))
-  a.menu-link(href="#{@uri}") #{@name}
-  - if @has_sub_items
-    =render_cell(:menu, :sub_items, @sub_items)
+- if @uri
+  li class=('menu-box' + (@is_active ? ' active' : ''))
+    a.menu-link(href="#{@uri}") #{@name}
+    - if @has_sub_items
+      =render_cell(:menu, :sub_items, @sub_items)

data/app/controllers/rademade_admin/abstract_controller.rb

@@ -40,5 +40,9 @@ module RademadeAdmin
       @current_user.is_a? RademadeAdmin.user_class and @current_user.admin?
     end
 
+    def current_ability
+      @current_ability ||= ::RademadeAdmin::Ability.new(@current_user)
+    end
+
   end
 end

data/app/controllers/rademade_admin/application_controller.rb

@@ -2,9 +2,5 @@
 module RademadeAdmin
   class ApplicationController < ActionController::Base
 
-    def current_ability
-      @current_ability ||= RademadeAdmin::Ability.new(@current_user)
-    end
-
   end
 end

data/app/controllers/rademade_admin/model_controller.rb

@@ -20,9 +20,9 @@ module RademadeAdmin
       saver = RademadeAdmin::Saver.new(model_info, params)
       saver.create_model
       saver.save_data
-      success_insert( saver.item )
+      success_insert saver.item
     rescue Exception => e
-      render_errors e.record.errors
+      render_record_errors e
     end
 
     def update
@@ -30,9 +30,9 @@ module RademadeAdmin
       saver = RademadeAdmin::Saver.new(model_info, params)
       saver.find_model
       saver.save_data
-      success_update( saver.item )
+      success_update saver.item
     rescue Exception => e
-      render_errors e.record.errors
+      render_record_errors e
     end
 
     def destroy
@@ -163,5 +163,14 @@ module RademadeAdmin
     def additional_options
       MenuCell.current_model = model
     end
+
+    def render_record_errors(e)
+      if e.respond_to? :record
+        render_errors e.record.errors
+      else
+        render_errors e.message
+      end
+    end
+
   end
 end

data/app/views/rademade_admin/_blocks/form/_control.html.erb

@@ -1,3 +1,3 @@
 <%= f.button :submit, :class => 'blue-btn' %>
 <span class="btn-sep"><%= t('rademade_admin.or') %></span>
-<%= link_to t('rademade_admin.cancel'), admin_list_uri(@model), :class => 'cancel-btn' %>
+<%= link_to t('rademade_admin.cancel'), admin_list_uri(@model) || '', :class => 'cancel-btn' %>

data/lib/rademade_admin/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module RademadeAdmin
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rademade_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Vladislav Melanitskiy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails