optimacms 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d34256f67251e158a73d11fe4896ff59d90d6d94
-  data.tar.gz: 7ac75029c6dc3fbf6d5d6636c127bbaeae2421b4
+  metadata.gz: 4c60c9ef63963a244adf9eaab559d1490f292855
+  data.tar.gz: adbe31584bf55c97a7402d8e122a0fd548d22678
 SHA512:
-  metadata.gz: d344bd52163c79fa9efbe7ab72d76fca8a75c2025e7319b17582701c800b1f57869d2d9d936ba691683e15a9358c1b7abee5c1d5512108897bdd6e0d9ac01b0b
-  data.tar.gz: 348b76b114d5cec57a2cc7ae82fb6a5d8036a95ec6ea7fae6b049a3584bd01235872e0f182c83878e7d23f981e7f484cb117e09ebb92000515eb215b2d9c9242
+  metadata.gz: 7902a4c4b5e51487a77caef4da999b60e7c378204ee16f1fc8b77b9a60472e09cc8053397fcea4ded0e14cdf7e5c653a502774694d3736a7261dccec51da0ce4
+  data.tar.gz: 789ee0c933a374638261adbbb2d9270e736d6503b451b02f675809bd10231905eb0f76594c701dcaa80ab3bc7f6ef1d30cf6006d52e0b1633f91b8f9ee0f1117

data/app/controllers/optimacms/admin/users_controller.rb

@@ -0,0 +1,129 @@
+module Optimacms
+  class Admin::UsersController < Admin::AdminBaseController
+    before_action :set_item, only: [:show, :edit, :update, :destroy]
+    before_action :init_common
+    before_action :init_data_form, only: [:new, :edit, :update, :create]
+
+
+
+    def init_common
+
+    end
+
+
+
+    search_filter :index, {save_session: true, search_method: :post_and_redirect, url: :users_url, search_url: :search_users_url, search_action: :search} do
+      # define filter
+      default_order "username", 'asc'
+
+      # fields
+      field :username, :string, :text, {label: '', default_value: '', condition: :like_full}
+    end
+
+    def index
+      @items = model.by_filter(@filter)
+
+    end
+
+
+    def show
+    end
+
+    def new
+      @item = model.new
+
+    end
+
+
+    def create
+      @item = model.new(item_params)
+      @res = @item.save
+
+      respond_to do |format|
+        if @res
+          format.html {
+            u = params[:continue]=="1" ? edit_user_path(@item) : url_list
+            redirect_to u, success: 'Successfully created'
+          }
+          #format.json {  render json: @item, status: :created, location: user_clients_url(:action => 'index')        }
+          format.js {}
+        else
+          format.html {  render :new }
+          #format.json { render json: @item.errors, status: :unprocessable_entity }
+          format.js {}
+        end
+      end
+    end
+
+
+    def edit
+      @item.save
+      @item.reload
+
+    end
+
+
+    def update
+      @item.attributes = item_params
+      @res = @item.save
+
+      if @res
+        u = params[:continue]=="1" ? edit_user_path(@item) : url_list
+        redirect_to u, success: 'Successfully updated'
+      else
+        render :edit
+      end
+    end
+
+
+
+    def destroy
+      @res = @item.destroy
+
+      if @res
+        redirect_to url_list, success: 'Successfully deleted'
+      else
+        redirect_to url_list, error: 'Cannot delete'
+      end
+    end
+
+
+    private
+
+    def init_data_form
+      @url_back = url_list
+
+      #@languages = Language.list_with_default
+    end
+
+
+    def model
+      CmsAdminUser
+    end
+
+    def model_param_name
+      :cms_admin_user
+    end
+
+    def url_list
+      users_url
+    end
+
+    # Use callbacks to share common setup or constraints between actions.
+    def set_item
+      @item = model.find(params[:id])
+
+      @url_back = url_list
+    end
+
+    def item_params
+      params.require(model_param_name).permit(:username, :email, :password, :password_confirmation)
+      #params.require(model_param_name).permit!
+    end
+
+
+
+
+  end
+end
+

data/app/controllers/optimacms/pages_controller.rb

@@ -43,7 +43,7 @@ module Optimacms
 
 
         #c.process_action(action)
-        c.dispatch(action, request)
+        c.dispatch(action, request, c.response)
         #c.process_action(action, tpl_filename)
 
         #app = "NewsController".constantize.action(action)

data/app/models/optimacms/cms_admin_user.rb

@@ -5,6 +5,37 @@ module Optimacms
     # Include default devise modules. Others available are:
     # :confirmable, :lockable, :timeoutable and :omniauthable
     #devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
-    devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable
+    devise :database_authenticatable, :recoverable, :rememberable, :trackable
+    #, :validatable
+
+
+    # search
+    searchable_by_simple_filter
+
+    ### validate
+    validates_confirmation_of :password
+
+    validates :password, :presence     => true,
+              :confirmation => true,
+              :length       => { :minimum => 6 },
+              :if           => :should_validate_password? # only validate if password changed!
+
+    def should_validate_password?
+      x = new_record? || !password.blank?
+      #if: Proc.new{|obj| obj.new_record? || !obj.<attribute>.blank? }
+    end
+
+    before_destroy :can_destroy?
+
+    def can_destroy?
+      !self.is_superadmin
+    end
+
+
+    ## properties
+
+    def is_superadmin?
+      self.is_superadmin
+    end
   end
 end

data/app/views/optimacms/admin/users/_form_fields.html.haml

@@ -0,0 +1,16 @@
+
+
+= render 'optimacms/admin/shared/form_errors', :object=>item
+
+= f.input :continue, as: :fake_hidden, input_html: {value: "0"}, label: false
+= hidden_field_tag :modal, @modal
+
+= f.input :username, label: "Username"
+= f.input :email, label: "E-mail"
+
+= f.input :password, label: "password"
+= f.input :password_confirmation, label: "repeat password"
+
+= f.button :save_continue_cancel, 'Save', :cancel=>@url_back
+
+

data/app/views/optimacms/admin/users/edit.html.haml

@@ -0,0 +1,20 @@
+%h1 User
+
+.row#mainform
+  .col-md-12
+    = horizontal_simple_form_for @item, {url: user_path(@item), :html => { :class => "form-horizontal", :role => "form" }}.merge((@modal==1 ? {remote: true}: {}))  do |f|
+      = render 'form_fields', f: f, item: @item
+
+
+
+
+:javascript
+
+  $( document ).ready(function() {
+    $('#mainform a.btn-save-continue').click(function(e){
+      e.preventDefault();
+      var f = $(this).closest("form");
+      f.find("input[name='continue']").val("1");
+      f.submit();
+    });
+  });

data/app/views/optimacms/admin/users/index.html.haml

@@ -0,0 +1,38 @@
+.page-header
+  .row
+    .col-md-6
+      %h1
+        Users
+        %small
+          <i class="ace-icon fa fa-angle-double-right"></i>
+          manage users for CMS admin area
+    .col-md-4
+      =link_to 'New', new_user_path(), :class=>'btn btn-sm btn-primary'
+
+
+.filter
+  = inline_filter_form_for(@filter)
+
+%table.table.table-striped.table-bordered
+  %tr
+    %th= link_to_sortable_column :username, 'username'
+    %th= link_to_sortable_column :email, 'email'
+    %th Role
+    %th Commands
+
+  - @items.each do |item|
+    %tr
+      %td
+        =link_to item.username, edit_user_path(item)
+      %td
+        =link_to item.email, edit_user_path(item)
+      %td
+        - if item.is_superadmin?
+          Superadmin
+        - else
+          admin
+      %td
+        =link_to 'Edit', edit_user_path(item)
+        =link_to 'Delete', user_path(item), :method => :delete, data: { confirm: 'Are you sure?' }
+
+=paginate @items, theme: 'bootstrap4'

data/app/views/optimacms/admin/users/new.html.haml

@@ -0,0 +1,30 @@
+.page-header
+  .row
+    .col-md-6
+      %h1
+        New user
+        %small
+          <i class="ace-icon fa fa-angle-double-right"></i>
+          create new user
+    .col-md-4
+      =link_to 'Back', users_path
+
+
+.row#mainform
+  .col-md-12
+    = horizontal_simple_form_for @item, {url: users_path, :html => { :class => "form-horizontal", :role => "form" }}.merge((@modal==1 ? {remote: true}: {}))  do |f|
+      = render 'form_fields', f: f, item: @item
+
+
+
+
+:javascript
+
+  $( document ).ready(function() {
+    $('#mainform a.btn-save-continue').click(function(e){
+      e.preventDefault();
+      var f = $(this).closest("form");
+      f.find("input[name='continue']").val("1");
+      f.submit();
+    });
+  });

data/config/routes.rb

@@ -93,6 +93,13 @@ Optimacms::Engine.routes.draw do
       end
     end
 
+    resources :users do
+      collection do
+        post 'search'
+      end
+
+    end
+
 
     get '/optimacms/maintenance', to: 'maintenance#index', as: :maintenance
 

data/lib/optimacms/concerns/admin_menu/admin_menu.rb

@@ -22,13 +22,24 @@ module Optimacms::Concerns::AdminMenu::AdminMenu
     end
 
     def get_menu
-      get_menu_basic + get_menu_custom + get_menu_system
+      get_menu_basic + get_menu_custom + get_menu_users + get_menu_system
     end
 
     def get_menu_custom
       []
     end
 
+    def get_menu_users
+      [
+          {title: 'Users', url: nil, submenu: [
+              {title: 'Users', url: Optimacms::Engine.routes.url_helpers.users_path},
+          ]
+          }
+
+      ]
+
+    end
+
     def get_menu_system
       [
           {title: 'System', url: nil, submenu: [

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/spec/dummy/config/database.yml

@@ -14,8 +14,8 @@ default: &default
   encoding: utf8
   pool: 5
   username: root
-  password:
-  host: localhost
+  password: Galactic1
+  host: 51.12.0.11
 
 development:
   <<: *default