ucb_rails 0.0.2 → 0.0.3

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

@@ -1,10 +1,11 @@
 class UcbRails::Admin::UsersController < UcbRails::Admin::BaseController
   before_filter :find_user, :only => [:edit, :update, :destroy]
+  respond_to :html, :js
   
   def index
     respond_to do |format|
       format.html { @users = UcbRails::User.all }
-      # format.json { render json: UsersDatatable.new(view_context) }
+      format.json { render json: UcbRails::UsersDatatable.new(view_context) }
     end
   end
   

data/app/datatables/ucb_rails/base_datatable.rb

@@ -0,0 +1,115 @@
+# Base class for server-side processing for datatable.js
+#
+# Inspired by http://railscasts.com/episodes/340-datatables
+#
+# Documentation on datatable.js parameters: http://datatables.net/usage/server-side
+#
+# class MyUsersController <  BaseController
+# 
+#   def index
+#     respond_to do |format|
+#       format.html
+#       format.json { render json: MyUsersDatatable.new(view_context) }
+#     end
+#   end
+#   
+# end
+# 
+# class MyUserDatatable < BaseDatatable
+# 
+#   private
+# 
+#   def default_scope
+#     User
+#   end
+#   
+#   def column_names
+#     @column_names ||= %w[first_name last_name]
+#   end
+#   
+#   # Must return valid argument(s) to ActiveRecord::Relation#where()
+#   # (Won't be called if _search_term_ is blank)
+#   def search(search_term)
+#     where("first_name like :search or last_name like :search", search: "#{search_term}%")
+#   end
+#   
+#   def record_to_data(user)
+#     [
+#       h(user.first_name),
+#       h(user.last_name),
+#       link_to("Edit", edit_admin_user_path(user), :id => dom_id(user)),
+#     ]
+#   end
+# 
+# end
+#
+class UcbRails::BaseDatatable
+  
+  def initialize(view)
+    @view = view
+  end
+
+  # Data structure required by datatable.js server calls
+  def as_json(options = {})
+    {
+      sEcho: params[:sEcho].to_i,
+      iTotalRecords: default_scope.count,
+      iTotalDisplayRecords: records.total_count,
+      aaData: data
+    }
+  end
+
+  private
+
+  # Returns Array of Array.
+  def data
+    @data ||= records.map { |record| record_to_data(record) }
+  end
+  
+  # Returns ActiveRecord::Relation
+  def records
+    @records ||= default_scope
+      .where(base_search)
+      .order(order)
+      .page(page)
+      .per(per)
+  end
+  
+  def base_search
+    search_term = params[:sSearch]
+    
+    if search_term.present?
+      search(search_term)
+    else
+      {}
+    end
+  end
+
+  def per
+    params[:iDisplayLength].to_i > 0 ? params[:iDisplayLength].to_i : 10
+  end
+
+  def page
+    params[:iDisplayStart].to_i/per + 1
+  end
+  
+  def order
+    order_clauses.join(', ')
+  end
+  
+  def order_clauses
+    (0...params['iSortingCols'].to_i).map { |i| order_clause(i) }
+  end
+  
+  def order_clause(i)
+    column_key = "iSortCol_#{i}"
+    direction_key = "sSortDir_#{i}"
+    "#{column_names[params[column_key].to_i]} #{params[direction_key]}"
+  end
+
+  # Delegate unknown methods to the view.  These are mostly standard View Helper methods.
+  def method_missing(*args, &block)
+    @view.send(*args, &block)
+  end
+  
+end

data/app/datatables/ucb_rails/users_datatable.rb

@@ -0,0 +1,32 @@
+class UcbRails::UsersDatatable < UcbRails::BaseDatatable
+
+  private
+
+  def default_scope
+    UcbRails::User
+  end
+  
+  def column_names
+    @column_names ||= %w[admin inactive first_name last_name email phone last_request_at uid]
+  end
+  
+  def search(search_term)
+    ["first_name like :search or last_name like :search", search: "#{search_term}%"]
+  end
+  
+  def record_to_data(user)
+    [
+      bln(user.admin),
+      bln(user.inactive),
+      h(user.first_name),
+      h(user.last_name),
+      h(user.email),
+      h(user.phone),
+      h(user.last_request_at),
+      h(user.uid),
+      link_to("Edit", edit_ucb_rails_admin_user_path(user), :id => dom_id(user)),
+      link_to('Delete', ucb_rails_admin_user_path(user), :method => :delete, :confirm => 'Are you sure?'),
+    ]
+  end
+
+end

data/app/helpers/ucb_rails/renderer/ldap_person_search_result_link.rb

@@ -43,8 +43,14 @@ module UcbRails
       end
       
       def classes
-        extra_class = params['result-link-class'].presence || 'result-link-default'
-        "result-link #{extra_class}"
+        ['result-link', params['result-link-class'].presence, default_class].select(&:presence)
+      end
+      
+      # default class if no url, no result-link-class
+      def default_class
+        return nil if url_param.present?
+        return nil if params['result-link-class'].present?
+        'result-link-default'
       end
       
       def item_url

data/app/views/ucb_rails/admin/users/_user.html.haml

@@ -1,3 +1,4 @@
+/ not used: see UcbRails::UsersDatatable
 %tr[user]
   = td_bln(user.admin)
   = td_bln(user.inactive)

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

@@ -2,7 +2,7 @@
 
 %p= link_to_new_user
 
-= ucbr_table_tag UcbRails::User do
+= ucbr_table_tag UcbRails::User, data: {url: ucb_rails_admin_users_path(format: "json")} do
   %thead
     %tr
       %th.min Admin?
@@ -16,25 +16,7 @@
       %th.min Edit
       %th.min Delete
   %tbody.highlight
-    = render partial: 'ucb_rails/admin/users/user', collection: @users
+    =# render partial: 'ucb_rails/admin/users/user', collection: @users
     
 = render :partial => 'ucb_rails/lps/modal'
-
-:javascript
-  $('#ucb_rails_users').dataTable({
-    "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
-    "sPaginationType": "bootstrap",
-    "bStateSave": true,
-    "iDisplayLength": 20,
-    "aLengthMenu": [[10, 20, 50, -1], [10, 20, 50, 'All']],
-    "aaSorting": [[ 5, "desc" ]],
-    "aoColumnDefs": [
-          { "aDataSort": [ 0, 2, 3 ], "aTargets": [ 0 ] }, // admin
-          { "aDataSort": [ 1, 2, 3 ], "aTargets": [ 0 ] }, // active
-          { "aDataSort": [ 1, 2 ], "aTargets": [ 2 ] }, // first name
-          { "aDataSort": [ 2, 1], "aTargets": [ 3 ] },   // last name
-          { "bSortable": false, "aTargets": [ 8 ] },   // edit
-          { "bSortable": false, "aTargets": [ 9 ] },   // delete
-        ]
-  });
   

data/lib/generators/ucb_rails/templates/app/assets/javascripts/ucb_rails/users_datatable.js

@@ -0,0 +1,26 @@
+$(function() {
+  
+  $('#ucb_rails_users').dataTable({
+    "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
+    "sPaginationType": "bootstrap",
+    "bProcessing": true,
+    "bServerSide": true,
+    "sAjaxSource": $('#ucb_rails_users').data('url'),
+    "bStateSave": true,
+    "iDisplayLength": 20,
+    "oLanguage": {
+      "sSearch": "First or Last Name starts with:"
+    },
+    "aLengthMenu": [[10, 20, 50, -1], [10, 20, 50, 'All']],
+    "aaSorting": [[ 5, "desc" ]],
+    "aoColumnDefs": [
+      { "aDataSort": [ 0, 2, 3 ], "aTargets": [ 0 ] }, // admin
+      { "aDataSort": [ 1, 2, 3 ], "aTargets": [ 0 ] }, // active
+      { "aDataSort": [ 2, 3 ], "aTargets": [ 2 ] }, // first name
+      { "aDataSort": [ 3, 2], "aTargets": [ 3 ] },   // last name
+      { "bSortable": false, "aTargets": [ 8 ] },   // edit
+      { "bSortable": false, "aTargets": [ 9 ] },   // delete
+    ]
+  }).fnSetFilteringDelay(250);
+  
+});

data/lib/ucb_rails.rb

@@ -3,6 +3,7 @@ require 'ucb_rails/log_tagger'
 
 require 'haml'
 require 'haml-rails'
+require 'kaminari'
 require 'omniauth'
 require 'omniauth-cas'
 require 'sass-rails'

data/lib/ucb_rails/version.rb

@@ -1,3 +1,3 @@
 module UcbRails
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -187,6 +187,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.11.2
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails_environment
   requirement: !ruby/object:Gem::Requirement
@@ -521,6 +537,8 @@ files:
 - app/controllers/ucb_rails/home_controller.rb
 - app/controllers/ucb_rails/ldap_person_search_controller.rb
 - app/controllers/ucb_rails/sessions_controller.rb
+- app/datatables/ucb_rails/base_datatable.rb
+- app/datatables/ucb_rails/users_datatable.rb
 - app/helpers/ucb_rails/admin/users_helper.rb
 - app/helpers/ucb_rails/extractable_helper.rb
 - app/helpers/ucb_rails/icons_helper.rb
@@ -553,9 +571,10 @@ files:
 - config/routes.rb
 - lib/generators/ucb_rails/install_generator.rb
 - lib/generators/ucb_rails/templates/app/assets/javascripts/application.js
-- lib/generators/ucb_rails/templates/app/assets/javascripts/lps.js
-- lib/generators/ucb_rails/templates/app/assets/javascripts/lps_typeahead.js
-- lib/generators/ucb_rails/templates/app/assets/javascripts/typeahead.js
+- lib/generators/ucb_rails/templates/app/assets/javascripts/ucb_rails/lps.js
+- lib/generators/ucb_rails/templates/app/assets/javascripts/ucb_rails/lps_typeahead.js
+- lib/generators/ucb_rails/templates/app/assets/javascripts/ucb_rails/typeahead.js
+- lib/generators/ucb_rails/templates/app/assets/javascripts/ucb_rails/users_datatable.js
 - lib/generators/ucb_rails/templates/app/assets/stylesheets/application.css
 - lib/generators/ucb_rails/templates/app/assets/stylesheets/bootstrap_and_overrides.css.scss
 - lib/generators/ucb_rails/templates/app/assets/stylesheets/ucb_rails.css.scss