adva 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da23aa37a656e830d04873424caa65522c9fb2e7032894266d0e7573fe6f6054
-  data.tar.gz: d04fc86b13d83a1bcd83a3b5d89572417b468914e634e4ff3a3359ee6a4fbcf0
+  metadata.gz: ee3ba355548f2d435cab4bed75a24bcd57ce604bccb9ce8040895c7cd7071cb1
+  data.tar.gz: c97a5d6de8e170695e217513ad3f915d6057c363ac909edd4d99af4d6b7e71a8
 SHA512:
-  metadata.gz: 658a74eacd08172e9be90bc4c888d995b055df6e94a2355eb11c9448004dc80b21176e2e37187290f5dab427b157426074e089a1d49105828cd86d93b6e4ffea
-  data.tar.gz: bcf0e907845beb83f018e3211fc3afe44cf65c82eecd94337a3f5a712f076cee03e43d0a79f70abb5161e48b73070b9674c0043db5137146ad5119ca04833ac1
+  metadata.gz: d49f370f2085930f92abce6373b902416ababc8d903c1fa019151363d4575d2258bf98413c171e8f5c5b915f32974ae17c7a59683ebfde49c2a39d03ea2df792
+  data.tar.gz: ed9b3eba97128897b5ed432e727fca912a02fc2e0b2ac60ff45b4f327a1c41275a50dbeec73bd5f54fb602ef1a068446fc1b23cceec38f7f4029d07a7fb98430

data/.gitignore

@@ -17,5 +17,6 @@ public/themes
 vendor/engines/adva_rbac/spec/db/*.sqlite3
 vendor/engines/adva_rbac/spec/log/*
 .DS_Store
+pkg
 *~
-/nbproject
+/nbproject

data/app/controllers/admin/users_controller.rb

@@ -1,9 +1,9 @@
 class Admin::UsersController < Admin::BaseController
-  before_action :set_users, :only => [:index]
   before_action :set_user,  :only => [:show, :edit, :update, :destroy]
   before_action :authorize_access
 
   def index
+    @users = User.where(admin: true).to_a + @site.users.to_a
   end
 
   def show
@@ -59,10 +59,6 @@ class Admin::UsersController < Admin::BaseController
       @menu = Menus::Admin::Users.new
     end
 
-    def set_users
-      @users = @site.users
-    end
-
     def set_user
       @user = User.find(params[:id])
     end

data/app/helpers/admin/base_helper.rb

@@ -1,48 +1,4 @@
 module Admin::BaseHelper
-  def self.define_shallow_resource_helpers options
-    from = options.delete(:from)
-    to = options.delete(:to)
-
-    from_namespace = from[0..-2].collect(&:to_s).join("_")
-    to_namespace = to[0..-2].collect(&:to_s).join("_")
-    resource = from[-1].to_s
-
-    def self.define_path_and_url_methods options
-      from = options.delete(:from)
-      to = options.delete(:to)
-
-      %w(path url).each do |suffix|
-        eval "def #{from}_#{suffix} *args; #{to}_#{suffix} *args; end"
-      end
-    end
-
-    # index
-    define_path_and_url_methods \
-      :from => [from_namespace, resource.pluralize].join("_"),
-      :to => [to_namespace, resource.pluralize].join("_")
-
-    # show
-    define_path_and_url_methods \
-      :from => [from_namespace, resource].join("_"),
-      :to => [to_namespace, resource].join("_")
-
-    # new
-    define_path_and_url_methods \
-      :from => [:new, from_namespace, resource].join("_"),
-      :to => [:new, to_namespace, resource].join("_")
-
-    # edit
-    define_path_and_url_methods \
-      :from => [:edit, from_namespace, resource].join("_"),
-      :to => [:edit, to_namespace, resource].join("_")
-  end
-
-  define_shallow_resource_helpers :from => [:admin, :category], :to => [:admin, :section, :category]
-  define_shallow_resource_helpers :from => [:admin, :content], :to => [:admin, :section, :content]
-  define_shallow_resource_helpers :from => [:admin, :article], :to => [:admin, :section, :article]
-  define_shallow_resource_helpers :from => [:admin, :link], :to => [:admin, :section, :link]
-
-
   def save_or_cancel_links(builder, options = {})
     save_text   = options.delete(:save_text)   || t(:'adva.common.save')
     or_text     = options.delete(:or_text)     || t(:'adva.common.connector.or')

data/app/views/admin/page/categories/new.html.erb

@@ -1,19 +1,19 @@
 <h2><%= t(:'adva.categories.titles.new') %></h2>
-  
+
 <%= form_for [:admin, @section, @category] do |f| %>
-  <% f.field_set do %>
+  <fieldset>
     <div class="col">
-    	<%= f.text_field :title, :label => true, :hint => :'adva.hints.categories' %>
-		</col>
-		
-		<% unless @section.categories.size < 2 %>
+      <%= f.text_field :title, :label => true, :hint => :'adva.hints.categories' %>
+    </div>
+
+    <% unless @section.categories.size < 2 %>
       <div class="col">
-	    	<%= f.select :parent_id, @section.categories.collect {|p| [p.title, p.id] unless p == @category }.compact, { :include_blank => true, :label => true } %>
-				<span class="hint" for="category_parent_id"><%= t :'adva.categories.hints.parent_setting' %></span>
-      </col>
-		<% end %>
-	<% end %>
+        <%= f.select :parent_id, @section.categories.collect {|p| [p.title, p.id] unless p == @category }.compact, { :include_blank => true, :label => true } %>
+        <span class="hint" for="category_parent_id"><%= t :'adva.categories.hints.parent_setting' %></span>
+      </div>
+    <% end %>
+  </fieldset>
 
-  <% save_or_cancel_links(f, :cancel_url => admin_categories_path) %>
+  <% save_or_cancel_links(f, cancel_url: [:admin, @section, :categories]) %>
 <% end %>
 

data/config/initializers/menus.rb

@@ -150,7 +150,7 @@ module Menus
         menu :left, :class => 'left', :type => Sections::Content
         menu :actions, :class => 'actions' do
           activates object.parent.find(:categories)
-          item :new, :action => :new, :resource => [@section, :category]
+          item :new, content: link_to("New", [:new, :admin, @section, :category])
           if @category && !@category.new_record?
             item :edit,   :action  => :edit,   :resource => @category
             item :delete, :content  => link_to("Delete", [:admin, @section, @category], :method => :delete)

data/lib/adva/version.rb

@@ -1,3 +1,3 @@
 module Adva
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adva
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -1170,7 +1170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: cutting edge cms, blog, wiki, forum