adva 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7baa47c6075f9798d681ccacd0033d3d5c36891e9b2e1387884dfffb6d5c29c7
-  data.tar.gz: aa3f0dada6d1cc160c1f6eccc4a4d30ecbc62121b0c40809ac3eb1da1def7380
+  metadata.gz: 7551b32c7b09d3b8d8fb27a688ab26de8181b18b9eef24e222414458aa89b4dd
+  data.tar.gz: 5cefaf35f1c471072301d1d468d3f15a95dd0e8346ab1f0c0fa0bc8d0b0fd7bd
 SHA512:
-  metadata.gz: 3876f18f354af37a91a8a8b1782b117e4fa48e228dc4fd360f13fc5c2c626510cf4890d5a981739723e15bc2c62126dbb389dac79127157dbfb7ecb205755b78
-  data.tar.gz: ab617bdb379883b286fe903d17d7b6c4c06a7a1dbc6f0f64fe314e09f36f3a54f380a7267e0363b0177f64b665942756ef3f2cbd46333505640299ff7164b33a
+  metadata.gz: 42b3bf7c35ab19fb5e9984ef2832f4ba09fa4a5144297bf13ec3f458538c4058163414ef660e3992e670be08371d3b453ee7a9b214307563a7847f0f0e713bb7
+  data.tar.gz: 027cf9c46de27d5c1bb124349c2f0f7055f8bd514a652dad1e1c63377c119b4ca4714cd805078c9fa28298e8e0333852ae0961ec8d7c825df078c591120d1127

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/controllers/base_controller.rb

@@ -28,7 +28,11 @@ class BaseController < ApplicationController
 
     def set_section
       @section ||= begin
-        sections.find_by_permalink(params[:section_permalink]) || sections.first
+        if params.key?(:section_permalink)
+          sections.find_by_permalink!(params[:section_permalink])
+        else
+          sections.first
+        end
       end
       raise ActiveRecord::RecordNotFound unless @section.published?(true) || current_user.admin?
       @section

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/lib/adva/version.rb

@@ -1,3 +1,3 @@
 module Adva
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adva
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2023-02-06 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.1.6
 signing_key: 
 specification_version: 4
 summary: cutting edge cms, blog, wiki, forum