adminsite 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 383e7e8f4e454d8ad1ddf3372b1330255a8b4ba6
-  data.tar.gz: e2566769fc2481ed240ac976432bc82613ee6d30
+  metadata.gz: 4414c6e5ddcff6f365d1067c1dfffea46d58f5d3
+  data.tar.gz: f0a4d9e59cfdbf84a31854a32aefab5cb9695a99
 SHA512:
-  metadata.gz: 815cb11156a7b609c3fc933edb6ff46c658553cf82f3e210f4d9ca0625aa3ebaa5c45e1fce9d7f6ff0b5d34411622b5eedb381ed4c1f41138e1bf9ab1ae980ba
-  data.tar.gz: 3facfcd8731ec0215afcf648353fb315cc761487ae0f6171eb97223b90eceecc3d6905d9724d55eb5c88475c1ad6b19e1563659ed333e5753fb1dc056056f582
+  metadata.gz: 2ed4ef7c1e9687290832b4a1419b386bdf22e9e18f4fdde288733fdb8acf812b3344d6e706c520f132e0c881d8799f0d79a7dc69c82d0918774c67100d2eebd8
+  data.tar.gz: ac586ac03e34133c5f7d537a946c8a7cd79ca1d9ed5244d483f587d05aa946755dbd1cf9e9cd63af372c227d5bad39f4b2505b9d3d6fdb952aaa1dca37929847

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adminsite (2.0.3)
+    adminsite (2.1.0)
       actionpack-page_caching
       codemirror-rails (>= 4.8)
       devise (~> 3.4)
@@ -98,14 +98,14 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mimemagic (0.3.0)
     mini_portile (0.6.2)
     minitest (5.7.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
-    paperclip (4.3.0)
+    paperclip (4.3.1)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
@@ -164,7 +164,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    sass (3.4.18)
+    sass (3.4.19)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -182,9 +182,9 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sprockets (3.3.4)
-      rack (~> 1.0)
-    sprockets-rails (2.3.2)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

data/app/admin_configs/adminsite/adminsite_admin_user_admin_config.rb

@@ -8,7 +8,7 @@ module Adminsite
       ]
     end
 
-    def attributes_edit
+    def attributes_edit(resource = nil)
       [ :name,
         :email,
         :password,
@@ -16,7 +16,7 @@ module Adminsite
       ]
     end
 
-    def attributes_show
+    def attributes_show(resource = nil)
       [ :name,
         :email,
         :updated_at
@@ -31,12 +31,15 @@ module Adminsite
       [ :new ]
     end
 
-    def default_member_actions
-      [ :edit,
-        :destroy]
+    def default_member_actions(resource = nil)
+      if resource == @current_adminsite_admin_user
+        [ :edit ]
+      else
+        [ :edit, :destroy]
+      end
     end
 
-    def label_attribute
+    def label_attribute(resource = nil)
       :email
     end
   end

data/app/admin_configs/adminsite/adminsite_file_asset_admin_config.rb

@@ -9,7 +9,7 @@ module Adminsite
       ]
     end
 
-    def attributes_show
+    def attributes_show(resource = nil)
       ['attachment.url'] + attributes_edit
     end
 
@@ -21,11 +21,11 @@ module Adminsite
       attributes_index
     end
 
-    def default_member_actions
+    def default_member_actions(resource = nil)
       [ :show, :destroy ]
     end
 
-    def label_attribute
+    def label_attribute(resource = nil)
       :attachment_file_name
     end
   end

data/app/admin_configs/adminsite/adminsite_page_admin_config.rb

@@ -11,7 +11,7 @@ module Adminsite
       ]
     end
 
-    def attributes_edit
+    def attributes_edit(resource = nil)
       [ :title,
         :url,
         :requires_login,
@@ -21,7 +21,7 @@ module Adminsite
       ]
     end
 
-    def attributes_show
+    def attributes_show(resource = nil)
       attributes_edit
     end
 
@@ -29,12 +29,11 @@ module Adminsite
       attributes_index
     end
 
-    def default_member_actions
-      [ :edit,
-        :destroy]
+    def default_member_actions(resource = nil)
+      [ :edit, :destroy]
     end
 
-    def label_attribute
+    def label_attribute(resource = nil)
       :title
     end
 

data/app/admin_configs/adminsite/adminsite_page_layout_admin_config.rb

@@ -8,13 +8,13 @@ module Adminsite
       ]
     end
 
-    def attributes_edit
+    def attributes_edit(resource = nil)
       [ :title,
         :body => {:input_html => {:class => 'code html'}}
       ]
     end
 
-    def default_member_actions
+    def default_member_actions(resource = nil)
       [ :edit,
         :destroy]
     end
@@ -23,7 +23,7 @@ module Adminsite
       attributes_index
     end
 
-    def label_attribute
+    def label_attribute(resource = nil)
       :title
     end
 

data/app/assets/stylesheets/adminsite/admin/base.scss

@@ -362,6 +362,17 @@ body.adminsite {
       opacity: 0.5;
       border-color: #e6e6e6;
     }
+    td.actions {
+      ul {
+        padding: 0;
+        margin: 0;
+      }
+      li {
+        list-style: none;
+        float: left;
+        padding-right: 8px;
+      }
+    }
     &.statistics {
       td {
         text-align: right;

data/app/controllers/adminsite/admin/adminsite_admin_users_controller.rb

@@ -12,8 +12,7 @@ module Adminsite
     end
 
     def resource_admin_config
-      # Adminsite::AdminConfig::Base.admin_config_of_class(resource_class)
-      # -> Result: "Adminsite::AdminConfig::#{config_class_name.gsub('::','')}" || Adminsite::AdminConfig::Base
+      # Adminsite::Admin::ResourcesController.resource_admin_config
       super
     end
 

data/app/controllers/adminsite/admin/adminsite_file_assets_controller.rb

@@ -45,8 +45,7 @@ class Adminsite::Admin::AdminsiteFileAssetsController < Adminsite::Admin::Resour
   end
 
   def resource_admin_config
-    # Adminsite::AdminConfig::Base.admin_config_of_class(resource_class)
-    # -> Result: "Adminsite::AdminConfig::#{config_class_name.gsub('::','')}" || Adminsite::AdminConfig::Base
+    # Adminsite::Admin::ResourcesController.resource_admin_config
     super
   end
 

data/app/controllers/adminsite/admin/adminsite_page_layouts_controller.rb

@@ -33,8 +33,7 @@ class Adminsite::Admin::AdminsitePageLayoutsController < Adminsite::Admin::Resou
   end
 
   def resource_admin_config
-    # Adminsite::AdminConfig::Base.admin_config_of_class(resource_class)
-    # -> Result: "Adminsite::AdminConfig::#{config_class_name.gsub('::','')}" || Adminsite::AdminConfig::Base
+    # Adminsite::Admin::ResourcesController.resource_admin_config
     super
   end
 

data/app/controllers/adminsite/admin/adminsite_pages_controller.rb

@@ -28,8 +28,7 @@ class Adminsite::Admin::AdminsitePagesController < Adminsite::Admin::ResourcesCo
   end
 
   def resource_admin_config
-    # Adminsite::AdminConfig::Base.admin_config_of_class(resource_class)
-    # -> Result: "Adminsite::AdminConfig::#{config_class_name.gsub('::','')}" || Adminsite::AdminConfig::Base
+    # Adminsite::Admin::ResourcesController.resource_admin_config
     super
   end
 

data/app/controllers/adminsite/admin/resources_controller.rb

@@ -119,7 +119,7 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
 
   def resource_admin_config
     return @resource_admin_config if @resource_admin_config.present?
-    @resource_admin_config = Adminsite::AdminConfig::Base.admin_config_of_class(resource_class)
+    @resource_admin_config = Adminsite::AdminConfig::Base.admin_config_of_class(resource_class, nil, current_adminsite_admin_user)
     @resource_admin_config
   end
 

data/app/models/adminsite/admin_config/base.rb

@@ -22,13 +22,13 @@ module Adminsite
           config_class
         end
 
-        def admin_config_of_class(class_name, admin_config_class = nil)
+        def admin_config_of_class(class_name, admin_config_class = nil, current_adminsite_admin_user )
           admin_config_class ||= @@admin_configs[class_name.to_s]
           if admin_config_class.blank?
             admin_config_class = admin_default_config_class(class_name.to_s)
             register_admin_configs(class_name.to_s, admin_config_class)
           end
-          eval(admin_config_class).new(class_name)
+          eval(admin_config_class).new(class_name, current_adminsite_admin_user)
         end
 
         def register_admin_configs(class_name, admin_config, override = true)
@@ -58,11 +58,11 @@ module Adminsite
         column_names
       end
 
-      def attributes_edit
+      def attributes_edit(resource = nil)
         @attributes_edit ||= (column_names - ignore_columns)
       end
 
-      def attributes_show
+      def attributes_show(resource = nil)
         attributes_edit
       end
 
@@ -70,7 +70,7 @@ module Adminsite
         attributes_index
       end
 
-      def default_member_actions
+      def default_member_actions(resource = nil)
         [ :show,
           :edit,
           :destroy]
@@ -80,7 +80,7 @@ module Adminsite
         [ :new ]
       end
 
-      def label_attribute
+      def label_attribute(resource = nil)
         :title
       end
 
@@ -90,9 +90,10 @@ module Adminsite
 
       protected
 
-      def initialize(resource_class)
+      def initialize(resource_class, current_adminsite_admin_user)
         require Adminsite::Engine.root.join("app/models/#{resource_class.name.underscore}") unless defined?(resource_class)
         @resource_class = resource_class
+        @current_adminsite_admin_user = current_adminsite_admin_user
       end
 
     end

data/app/views/adminsite/admin/resources/_form.haml

@@ -1,5 +1,5 @@
 = f.inputs do
-  - resource_admin_config.attributes_edit.each do |attr|
+  - resource_admin_config.attributes_edit(@resource).each do |attr|
     - if attr.is_a?(Hash)
       = f.input attr.keys.first, attr.values.first
     - else

data/app/views/adminsite/admin/resources/_list.haml

@@ -3,16 +3,17 @@
     %th
     - resource_admin_config.attributes_index.each do |attr|
       %th= sort_link(@q, attr)
-    - resource_admin_config.default_member_actions.each do |action|
-      %th
+    %th Actions
   - @resources.each do |resource|
     %tr{onClick: 'Adminsite.selectedRow(this);'}
       %td.resource_selection_cell
         = check_box_tag 'collection_selection[]', resource.id, false, :class => 'collection_selection'
       - resource_admin_config.attributes_index.each do |attr|
         = display_resource_value(resource, attr)
-      - resource_admin_config.default_member_actions.each do |action|
-        %td= send("link_to_#{action}", resource)
+      %td.actions
+        %ul
+          - resource_admin_config.default_member_actions(resource).each do |action|
+            %li= send("link_to_#{action}", resource)
 
 = paginate(@resources, :window => 2)
 %br

data/app/views/adminsite/admin/resources/edit.haml

@@ -1,6 +1,6 @@
 - content_for :header_left do
   = "Edit #{label_resource_class}: '#{label_resource}'"
-  = link_to_show @resource if resource_admin_config.default_member_actions.include?(:show)
+  = link_to_show @resource if resource_admin_config.default_member_actions(@resource).include?(:show)
 - content_for :header_right do
   = link_to_back 'Back', admin_resource_path
 

data/app/views/adminsite/admin/resources/show.haml

@@ -1,12 +1,12 @@
 - content_for :header_left do
   = "Show #{label_resource_class}: '#{label_resource}'"
-  = link_to_edit @resource if resource_admin_config.default_member_actions.include?(:edit)
+  = link_to_edit @resource if resource_admin_config.default_member_actions(@resource).include?(:edit)
 - content_for :header_right do
   = link_to_back 'Back', admin_resource_path
 
 .formtastic
   %table
-    - resource_admin_config.attributes_show.each do |attr|
+    - resource_admin_config.attributes_show(@resource).each do |attr|
       - attr = attr.keys.first if attr.is_a?(Hash)
       %tr
         %th

data/lib/adminsite/version.rb

@@ -1,3 +1,3 @@
 module Adminsite
-  VERSION = "2.0.3" unless defined?(Adminsite::VERSION)
+  VERSION = "2.1.0" unless defined?(Adminsite::VERSION)
 end

data/lib/generators/adminsite/add_resource/templates/admin_configs/resource_admin_config.rb

@@ -13,15 +13,15 @@ module Adminsite
     #   column_names
     # end
 
-    # def attributes_edit
+    # def attributes_edit(resource = nil)
     #   @attributes_edit ||= (column_names - ignore_columns)
     # end
 
-    # def attributes_show
+    # def attributes_show(resource = nil)
     #   attributes_edit
     # end
 
-    # def default_member_actions
+    # def default_member_actions(resource = nil)
     #   [ :show,
     #     :edit,
     #     :destroy]
@@ -35,7 +35,7 @@ module Adminsite
     #   attributes_index
     # end
 
-    # def label_attribute
+    # def label_attribute(resource = nil)
     #   :title
     # end
 

data/lib/generators/adminsite/add_resource/templates/controllers/admin_resource_controller.rb

@@ -11,8 +11,7 @@ class Adminsite::Admin::<%= @resource_class.gsub('::','') %>sController < Admins
   end
 
   def resource_admin_config
-    # Adminsite::AdminConfig::Base.admin_config_of_class(resource_class)
-    # -> Result: "Adminsite::AdminConfig::#{config_class_name.gsub('::','')}" || Adminsite::AdminConfig::Base
+    # Adminsite::Admin::ResourcesController.resource_admin_config
     super
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminsite
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Robin Wunderlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails