optimacms 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e2dc6fa03ea942a6e9d3ef195a06363bc18a0f4
-  data.tar.gz: 798925d1118f0e30a770763fce5347e74d3016b7
+  metadata.gz: d690098f1fbebd10c9858d507d9b809782a507ba
+  data.tar.gz: 435eab4ff73c4337b0ccce2ee1e81604223fbad4
 SHA512:
-  metadata.gz: 3fa5a83ba90ddd2100feb359fbcc9c2eb454785e0bd9ed272662c0188258f93467fa990121ead23da1bb9e362063b8383b24cab31f22ba0aa18679122e44466d
-  data.tar.gz: bc4891f031058002b7d7154b38a621044a85ec2d93c4b98c87921d353c2a284294f67232914dab33ff842ab08e28c8bab47e6c0e93a51e3f14e21e48e8a1d430
+  metadata.gz: 06fb6ac517f14343ade996d544ea762ca4bf475cbe3b76227d0c8252f3de4741f2fc62cff16259e3f0105059b3ad32ce31cf653556ea5425f67e6af3be1602ae
+  data.tar.gz: 2b32a323474d1aa598a1d3e12da925149ed09fb9c00247cb602fa9c0750df53d477fc1e47c8b5954a0d58ddd7a1d7162eb6f7aa205e5af05c946edb8bdfce688

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

@@ -6,24 +6,100 @@ module Optimacms
     before_action :set_item, only: [:show, :edit, :update, :destroy, :editfolder, :updatefolder]
     before_action :init_data_form, only: [:edit, :new]
 
-    before_action :init_tabledata, :only => [:index, :search]
-
 
     def index
-      @items = model.list(@filter, @pg)
+      @items = model.by_filter(@filter)
+      #@items = model.where(@filter.where).order(@filter.order_string).page(@filter.page)
 
       #
       @parent_id = @filter.v('parent_id')
+      #@parent_id = (@parent_id || 0).to_i
       @parent = Page.find(@parent_id) rescue nil
 
     end
 
-    def search
+    def search_old
       redirect_to pages_path
     end
 
 
 
+    def url_list
+      pages_url
+    end
+
+
+    #include SimpleFilter::Controller
+    #search_filter :index, {save_session: true, search_method: :post_and_redirect, index_url: :pages_url, search_url: :search_pages_url, search_action: :search} do
+    search_filter :index, {save_session: true, search_method: :post_and_redirect, search_url: :search_pages_url, search_action: :search} do
+      # define filter
+      default_order "created_at", 'desc'
+
+      # fields
+      field :title, :string, :text, {label: '', default_value: '', condition: :like_full}
+      field :parent_id, :int, :hidden, {label: '', default_value: 0, ignore_value: 0}
+    end
+
+
+    def init_filter_old
+
+      # input
+      @pg = params[:pg].to_i || 1
+
+      #
+      @filter = Filters::FormFilter.new(session, 'admin_pages')
+
+      # set filter fields
+      @filter.add_fields_from_array(
+          [
+              #{name: 'uid', type: 'text', dbtype: FormFilter::DBTYPE_STRING, title: 'UID', def:'', opt: {width: 80}},
+              #{name: 'status', type: 'text', dbtype: FormFilter::DBTYPE_STRING, title: 'Status', def: '', opt: {width: 120}},
+              {name: 'title', type: 'text', dbtype: Filters::FormFilter::DBTYPE_STRING, title: 'Title', def: '', opt: {width: 120}},
+              {name: 'parent_id', type: 'int', dbtype: Filters::FormFilter::FIELD_TYPE_HIDDEN, title: '', def: 0},
+              #{name: 'client_id', type: FormFilter::FIELD_TYPE_HIDDEN, dbtype: FormFilter::DBTYPE_INT, title: 'Client', def: 0, opt: {width: 120}},
+              #{name: 'client', type: FormFilter::FIELD_TYPE_SELECT_AUTO,  dbtype: FormFilter::DBTYPE_STRING, title: 'Client', def: '', opt: {width: 120, field_id:'client_id', url_query: clients_url(:action=>'list')}},
+
+              #{name: 'status_id', type: FormFilter::FIELD_TYPE_HIDDEN,  dbtype: FormFilter::DBTYPE_INT, title: 'Status', def: 0, opt: {width: 120}},
+              #{name: 'status', type: FormFilter::FIELD_TYPE_SELECT_AUTO,  dbtype: FormFilter::DBTYPE_STRING, title: 'Status', def: '', opt: {width: 120, field_id:'status_id', url_query: statuses_url(:action=>'list')}},
+
+          ]
+      )
+
+      #
+      if params.has_key? :parent_id
+        @filter.set 'parent_id', params[:parent_id]
+      end
+      #@filter.set 'owner_id', current_user.owner_id
+
+      #
+      @cmd = params[:cmd] || ''
+
+
+      # post
+      if request.post? && params[:filter]
+        if params[:cmd]=='clear'
+          @filter.clear_data
+
+          redirect_to url_list and return
+        else
+          @filter.set_data_from_form(params[:filter] || [])
+          redirect_to url_list and return
+        end
+
+      end
+
+      # order
+      @filter.set_order_default('created_at' ,'desc')
+      #@filter.set_order('created_at' ,'desc')
+
+      if @cmd=='order'
+        @filter.set_order params[:orderby], params[:orderdir]
+        redirect_to url_list and return
+      end
+
+
+    end
+
     def show
     end
 
@@ -111,6 +187,19 @@ module Optimacms
     end
 
 
+
+
+
+
+    def table_columns
+
+      @table_columns = [
+          {name: "id", title: "##"},
+          {name: "title", title: "title"},
+      ]
+    end
+
+
     private
       def model
         Page
@@ -137,83 +226,6 @@ module Optimacms
       end
 
 
-    # filter
-    #include SimpleFilters::Controller
-
-
-    def init_tabledata
-      init_filter
-    end
-
-    def init_filter
-      # input
-      @pg = params[:pg].to_i || 1
-
-      #
-      @filter = Filters::FormFilter.new(session, 'admin_pages')
-
-      # set filter fields
-      @filter.add_fields_from_array(
-          [
-              #{name: 'uid', type: 'text', dbtype: FormFilter::DBTYPE_STRING, title: 'UID', def:'', opt: {width: 80}},
-              #{name: 'status', type: 'text', dbtype: FormFilter::DBTYPE_STRING, title: 'Status', def: '', opt: {width: 120}},
-              {name: 'title', type: 'text', dbtype: Filters::FormFilter::DBTYPE_STRING, title: 'Title', def: '', opt: {width: 120}},
-              {name: 'parent_id', type: 'int', dbtype: Filters::FormFilter::FIELD_TYPE_HIDDEN, title: '', def: 0},
-              #{name: 'client_id', type: FormFilter::FIELD_TYPE_HIDDEN, dbtype: FormFilter::DBTYPE_INT, title: 'Client', def: 0, opt: {width: 120}},
-              #{name: 'client', type: FormFilter::FIELD_TYPE_SELECT_AUTO,  dbtype: FormFilter::DBTYPE_STRING, title: 'Client', def: '', opt: {width: 120, field_id:'client_id', url_query: clients_url(:action=>'list')}},
-
-              #{name: 'status_id', type: FormFilter::FIELD_TYPE_HIDDEN,  dbtype: FormFilter::DBTYPE_INT, title: 'Status', def: 0, opt: {width: 120}},
-              #{name: 'status', type: FormFilter::FIELD_TYPE_SELECT_AUTO,  dbtype: FormFilter::DBTYPE_STRING, title: 'Status', def: '', opt: {width: 120, field_id:'status_id', url_query: statuses_url(:action=>'list')}},
-
-          ]
-      )
-
-      #
-      if params.has_key? :parent_id
-        @filter.set 'parent_id', params[:parent_id]
-      end
-      #@filter.set 'owner_id', current_user.owner_id
-
-      #
-      @cmd = params[:cmd] || ''
-
-
-      # post
-      if request.post? && params[:filter]
-        if params[:cmd]=='clear'
-          @filter.clear_data
-
-          redirect_to url_list and return
-        else
-          @filter.set_data_from_form(params[:filter] || [])
-          redirect_to url_list and return
-        end
-
-      end
-
-      # order
-      @filter.set_order_default('created_at' ,'desc')
-      #@filter.set_order('created_at' ,'desc')
-
-      if @cmd=='order'
-        @filter.set_order params[:orderby], params[:orderdir]
-        redirect_to url_list and return
-      end
-
-
-    end
-
-
-    def table_columns
-
-      @table_columns = [
-          {name: "id", title: "##"},
-          {name: "title", title: "title"},
-      ]
-    end
-
-
-
   end
 
 

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

@@ -6,7 +6,7 @@ module Optimacms
     before_action :set_item, only: [:show, :edit, :update, :destroy]
     before_action :init_common
     before_action :init_data_form, only: [:new, :edit, :newfolder, :editfolder, :newattach]
-    before_action :init_tabledata, :only => [:index, :search]
+    #before_action :init_tabledata, :only => [:index, :search]
 
     before_action :set_layout_modal
 
@@ -17,6 +17,8 @@ module Optimacms
     end
 
     def index
+      #@filter.clear_data
+
       #
       @parent_id = @filter.v('parent_id').to_i
       @parent = Template.find(@parent_id) rescue nil
@@ -26,14 +28,30 @@ module Optimacms
       end
 
       #
-      @items = model.list(@filter, @pg)
+      @items = model.by_filter(@filter)
+      #@items = model.where(@filter.where).order(@filter.order_string).page(@filter.page)
+
 
     end
 
-    def search
-      redirect_to pages_path
+    #include SimpleFilter::Controller
+    search_filter :index, {save_session: true, search_method: :post_and_redirect, search_url: :search_templates_url, search_action: :search} do
+      # define filter
+      default_order "title", 'asc'
+
+      # fields
+      field :title, :string, :text, {label: '', default_value: '', condition: :like_full}
+      #field :parent_id, :int, :hidden, {label: '', default_value: 0, ignore_value: 0, condition: :empty}
+      field :parent_id, :int, :hidden, {label: '', default_value: 0, ignore_value: 0, condition: :custom, condition_scope: :of_parent}
+
+      #field :category_id, :int, :select, {collection: [['UGX- Uganda Shillings',1],['USD- US Dollars',2]], label_method: :first, value_method: :last}
+      #field :type_id, :int, :select, {label: 'Type', default_value: 0, collection: TemplateType.all, label_method: :title, value_method: :id}
+      #field :type, :string, :autocomplete, {label: 'Type', default_value: '', :source_query => :autocomplete_templates_url}
+
     end
 
+
+
     def autocomplete
       q = params[:q]
       type_id = (params[:t] || TemplateType::TYPE_PAGE).to_i

data/app/controllers/optimacms/application_controller.rb

@@ -1,5 +1,6 @@
 module Optimacms
-  class ApplicationController < ActionController::Base
+  #class ApplicationController < ActionController::Base
+  class ApplicationController < ::ApplicationController
     protect_from_forgery with: :exception
 
     # include FontAwesome::Rails::IconHelper

data/app/helpers/optimacms/application_helper.rb

@@ -1,8 +1,9 @@
 module Optimacms
   module ApplicationHelper
 
-    include ActionView::Helpers::ApplicationHelper
-    x=0
+    #include ActionView::Helpers::ApplicationHelper
+    #include SimpleFilter::FormsHelper
+
 
     def method_missing(method, *args, &block)
       main_app.send(method, *args, &block)

data/app/helpers/optimacms/forms_helper.rb

@@ -14,15 +14,61 @@ module Optimacms
 
 
       options[:wrapper] = :horizontal_form
-      options[:wrapper_mappings] = {
-        check_boxes: :horizontal_radio_and_checkboxes,
-        radio_buttons: :horizontal_radio_and_checkboxes,
-        file: :horizontal_file_input,
-        boolean: :horizontal_boolean
-      }
+      options[:wrapper_mappings] = {check_boxes: :horizontal_radio_and_checkboxes, radio_buttons: :horizontal_radio_and_checkboxes, file: :horizontal_file_input,boolean: :horizontal_boolean      }
       simple_form_for(resource, options, &block)
     end
 
 
+
+    def inline_simple_search_form_for(filter_object, options = {}, &block)
+      return render 'tableview/filter.html.haml', style: :inline, filter_object: filter_object
+      return
+
+      options[:html] ||= {}
+
+      options[:url] = send(filter_object.url)
+
+      options[:html][:role] = 'form'
+
+      # class
+      options[:html][:class] ||= []
+      if options[:html][:class].is_a? String
+        options[:html][:class] = [options[:html][:class]]
+      end
+      options[:html][:class] << 'form-inline'
+      options[:html][:id] = 'formFilter'
+
+      options[:wrapper] = :inline_search_form
+      options[:wrapper_mappings] = {      }
+
+
+      capture do
+        simple_form_for(:filter, options) do |f|
+          concat(hidden_field_tag 'cmd', 'apply')
+          concat(render 'tableview/filter_fields', filter: filter_object, f: f)
+          concat(render 'tableview/buttons_apply_clear_inline', filter: filter_object, f: f)
+        end
+      end
+
+    end
+
+
+    def horizontal_simple_search_form_for(filter_object, options = {}, &block)
+      return render 'tableview/filter.html.haml', style: :horizontal, filter_object: filter_object
+    end
+
+
+    def link_to_sortable_column(field_name, title = nil, html_options = nil, &block)
+      html_options ||= {}
+
+      if @filter.search_method_post_and_redirect?
+        html_options[:method] = :post
+      end
+
+      url = send(@filter.url, @filter.url_params_for_sortable_column(field_name))
+
+      link_to(title, url, html_options)
+    end
+
   end
 end

data/app/models/optimacms/page.rb

@@ -22,7 +22,13 @@ module Optimacms
     #
     paginates_per 10
 
+    # search
+    searchable_by_simple_filter
+
+
+
     #### save
+
     def save
       begin
         super
@@ -77,10 +83,10 @@ module Optimacms
 
 
     #### search
-
-    def self.list(filter, pg)
-
-      pg =1 if pg.nil? || pg<=0
+=begin
+    def self.search_by_filter(filter)
+      pg = filter.page
+      #pg =1 if pg.nil? || pg<=0
 
       order = filter.order
 
@@ -92,9 +98,6 @@ module Optimacms
         orderdir = order[0][1]
       end
 
-      #@items = Task.includes(:status, :client, :contacts).for_user(current_user.id).all
-      #includes(:status, :client, :contacts).for_user(filter['user_id'])
-      #includes(:status, :client, :contacts, :received_user)
       self.where(get_where(filter.data))
         .order(" #{orderby} #{orderdir}")
         .page(pg)
@@ -104,11 +107,15 @@ module Optimacms
     def self.get_where(values)
       w = '1=1 '
       #w << " AND uid like '#{values['uid']}%' " if values['uid'] && !values['uid'].blank?
-      w << " AND title like '%#{values['title']}%' " if values['title'] && !values['title'].blank?
-      w << " AND parent_id = '#{values['parent_id']}' " if !values['parent_id']!=-1
+      v = values[:title]
+      w << " AND title like '%#{v}%' " if v && !v.blank?
+
+      v = values[:parent_id]
+      w << " AND parent_id = '#{v}' " if !v!=-1
 
       w
     end
+=end
 
     def _before_save
 

data/app/models/optimacms/template.rb

@@ -32,6 +32,13 @@ module Optimacms
     scope :layouts, -> { where(is_folder: false, type_id: TemplateType::TYPE_LAYOUT) }
 
 
+    # search
+    searchable_by_simple_filter
+    scope :of_parent, lambda {  |parent_id| where_parent(parent_id) }
+
+
+
+
     ###
     def to_s
       "#{title} (#{basepath})"
@@ -56,44 +63,17 @@ module Optimacms
 
     ##### search
 
-    def self.list(filter, pg)
-
-      pg =1 if pg.nil? || pg<=0
-
-      order = filter.order
-
-      if order.empty?
-        orderby = 'id'
-        orderdir = 'asc'
-      else
-        orderby = order[0][0]
-        orderdir = order[0][1]
-      end
-
-      #@items = Task.includes(:status, :client, :contacts).for_user(current_user.id).all
-      #includes(:status, :client, :contacts).for_user(filter['user_id'])
-      #includes(:status, :client, :contacts, :received_user)
-      q = self.where(get_where(filter.data))
-
-      parent_id = filter.data['parent_id'].to_i
+    def self.where_parent(parent_id)
       if parent_id==0
-        q = q.roots
+        roots
       elsif parent_id>0
-        q = q.children_of(parent_id.to_s)
+        children_of(parent_id.to_s)
       end
-
-      q.order(" #{orderby} #{orderdir}").page(pg)
     end
 
-    def self.get_where(values)
-      w = '1=1 '
-      #w << " AND uid like '#{values['uid']}%' " if values['uid'] && !values['uid'].blank?
-      w << " AND title like '%#{values['title']}%' " if values['title'] && !values['title'].blank?
-      #w << " AND parent_id = '#{values['parent_id']}' " if !values['parent_id']!=-1
 
-      w
-    end
 
+    #### operations
 
     def attach
       # check if file exists

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

@@ -5,14 +5,25 @@
         Pages
         %small
           <i class="ace-icon fa fa-angle-double-right"></i>
-          edit pages content and URLs
+          manage pages
     .col-md-5
       =link_to 'New page', new_page_path(:parent_id=>@parent_id), :class=>'btn btn-sm btn-primary'
       =link_to 'New folder', newfolder_pages_path(:parent_id=>@parent_id, :is_folder=>1), :class=>'btn btn-sm btn-default'
 
 
 .filter
-  = form_tag(search_pages_url(:action=>'index'), method: "post", :class=>'form-inline', :name=>'formFilter', :id=>'formFilter') do
+  = inline_filter_form_for(@filter)
+
+  -#= simple_form_for(:filter, url: '/', wrapper: :horizontal_search_form, wrapper_mappings: { check_boxes: :search_horizontal_radio_and_checkboxes,  radio_buttons: :search_horizontal_radio_and_checkboxes,          boolean: :search_horizontal_boolean        },
+  -#= simple_form_for(:filter, url: pages_url, wrapper: :inline_search_form, wrapper_mappings: { },
+        html: {:id=>'formFilter'}) do |f|
+    = hidden_field_tag 'cmd', 'apply'
+    = render 'tableview/filter_fields', filter: @filter, f: f
+    = render 'tableview/buttons_apply_clear_simple_form_inline', filter: @filter, f: f
+
+
+
+  -#= form_tag(search_pages_url(:action=>'index'), method: "post", :class=>'form-inline', :name=>'formFilter', :id=>'formFilter') do
     = hidden_field_tag 'cmd', 'apply'
 
     = render :partial=>'tableview/filter_fields', :locals => {:filter=>@filter}
@@ -29,7 +40,8 @@
 %table.table.table-striped.table-bordered
   %tr
     %th
-      = link_to 'Title', pages_path(:cmd=>'order', :orderby=>'title', :orderdir=>@filter.get_opposite_order_dir_for_column('title'))
+      -#= link_to 'Title', pages_path(:cmd=>'order', :orderby=>'title', :orderdir=>@filter.get_opposite_order_dir_for_column('title'))
+      = link_to 'Title', '#'
     %th Name
     %th URL
     %th Commands

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

@@ -13,7 +13,10 @@
 
 
 .filter
-  = form_tag(search_templates_url(:action=>'index'), method: "post", :class=>'form-inline', :name=>'formFilter', :id=>'formFilter') do
+  = inline_filter_form_for(@filter)
+  -#= horizontal_filter_form_for(@filter)
+
+  -#= form_tag(search_templates_url(:action=>'index'), method: "post", :class=>'form-inline', :name=>'formFilter', :id=>'formFilter') do
     = hidden_field_tag 'cmd', 'apply'
 
     = render :partial=>'tableview/filter_fields', :locals => {:filter=>@filter}
@@ -34,7 +37,8 @@
 %table.table.table-striped.table-bordered
   %tr
     %th
-      = link_to 'Title', pages_path(:cmd=>'order', :orderby=>'title', :orderdir=>@filter.get_opposite_order_dir_for_column('title'))
+      = link_to_sortable_column :title, 'Title'
+      -#= link_to 'Title', pages_path(:cmd=>'order', :orderby=>'title', :orderdir=>@filter.get_opposite_order_dir_for_column('title'))
     %th Path
     %th Commands
 

data/config/initializers/simple_form_simple_search_boostrap.rb

@@ -0,0 +1,6 @@
+
+SimpleForm.setup do |config|
+
+
+
+end

data/lib/optimacms/engine.rb

@@ -5,12 +5,14 @@ module Optimacms
 
 
     config.watchable_dirs['lib'] = [:rb] if Rails.env.development?
+    config.watchable_dirs['app/helpers'] = [:rb] if Rails.env.development?
 
     #config.autoload_paths << File.expand_path("../lib/some/path", __FILE__)
     #config.autoload_paths << File.expand_path("../lib/optimacms/path", __FILE__)
 
     config.autoload_paths += Dir["#{Optimacms::Engine.root}/app/helpers/"]
     config.autoload_paths += Dir["#{Optimacms::Engine.root}/app/helpers/optimacms/"]
+    config.autoload_paths += Dir["#{Optimacms::Engine.root}/app/helpers/simple_filter/"]
     config.autoload_paths += Dir["#{Optimacms::Engine.root}/app/helpers/**/"]
 
     config.autoload_paths += Dir["#{Optimacms::Engine.root}/lib/"]

data/lib/optimacms/filters/form_filter.rb

@@ -1,3 +1,4 @@
+=begin
 module Optimacms
   module Filters
     class FormFilter
@@ -92,7 +93,7 @@ module Optimacms
       end
 
       def v(name, v_def=nil)
-        if (data.has_key? name) && (!data[name].nil?)
+        if (data.has_key? name) && (!data[name].nil?) && (!data[name].nil?)
           return data[name]
         end
 
@@ -221,4 +222,6 @@ module Optimacms
       end
     end
   end
-end
+end
+
+=end

data/lib/optimacms/mycontroller.rb

@@ -1,42 +1,42 @@
 module Optimacms
-      module Mycontroller
-      #extend ActiveSupport::Concern
+  module Mycontroller
+    #extend ActiveSupport::Concern
 
-      #included do
-      #  before_filter :my_set_render
-      #end
+    #included do
+    #  before_filter :my_set_render
+    #end
 
-      def my_set_render
-        @is_optimacms = true
+    def my_set_render
+      @is_optimacms = true
 
-      end
-
-      def default_render(*args)
-        if self.controller_name!='pages' && !@optimacms_tpl.nil? && @is_optimacms
-          render @optimacms_tpl, :layout=>@optimacms_layout and return
-          #(render :text => "hello", :layout => @optimacms_layout) and return
+    end
 
-          # http://stackoverflow.com/questions/21129587/ruby-on-rails-how-to-render-file-as-plain-text-without-any-html
-          #render :plain will set the content type to text/plain
-          #render :html will set the content type to text/html
-          #render :body will not set the content type header.
-          # render text: "some text". :plain does not work.
-        end
+    def default_render(*args)
+      if self.controller_name!='pages' && !@optimacms_tpl.nil? && @is_optimacms
+        render @optimacms_tpl, :layout=>@optimacms_layout and return
+        #(render :text => "hello", :layout => @optimacms_layout) and return
 
-        super
+        # http://stackoverflow.com/questions/21129587/ruby-on-rails-how-to-render-file-as-plain-text-without-any-html
+        #render :plain will set the content type to text/plain
+        #render :html will set the content type to text/html
+        #render :body will not set the content type header.
+        # render text: "some text". :plain does not work.
       end
 
-      def my_set_render_template(tpl_view, tpl_layout)
-        @optimacms_tpl = tpl_view
-        @optimacms_layout = tpl_layout
-      end
+      super
+    end
 
-      def my_set_meta(meta)
-        @optimacms_meta_title = meta[:title]
-        @optimacms_meta_keywords = meta[:keywords]
-        @optimacms_meta_description = meta[:description]
-      end
+    def my_set_render_template(tpl_view, tpl_layout)
+      @optimacms_tpl = tpl_view
+      @optimacms_layout = tpl_layout
+    end
 
+    def my_set_meta(meta)
+      @optimacms_meta_title = meta[:title]
+      @optimacms_meta_keywords = meta[:keywords]
+      @optimacms_meta_description = meta[:description]
     end
+
+  end
 end
 

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.15"
+  VERSION = "0.1.17"
 end