tb_core 1.3.7 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e447994850df42f2d94bace466371bcc952a6bb
-  data.tar.gz: 3d2363bf502fdfc50ce228186bfd403ab7401498
+  metadata.gz: 7071129edfa67883164c13d28337400840d8977b
+  data.tar.gz: aee125137d5a1b6c5bd033480eccbf555fddf2fa
 SHA512:
-  metadata.gz: 7f5a259c7068627afd84e7fccb1e45704660d5db6e814e8295a20d2d5318b86f30f92750e1602ee805700a2ca2abcac5ec3074fc300a48eae176e84060a3da9c
-  data.tar.gz: 53bb1073d4757b407f1d2a0ddffbff390c45a4c2b00579eabb09e5b9502b83e3f14badb3b5500434afc68bb198419e078a789b2e0cd745f158f14cc31c00173f
+  metadata.gz: 474dd7c6e09fd2a1228387c2281a2156658b52b3eb3a05f634827cfa1f8d5efeda720dd0ccffa1306293ec87dea42567239ccde4ed5d0157f67431792bfa40fc
+  data.tar.gz: d6ed5438c32dc90b131dc4bf6f907a0dac1de00fc17a48d01e043578b7f873263731e647ccf2526f55a18950f41e8022e3868c72a44bd4abbb6dda285cbe895f

data/app/controllers/admin/users_controller.rb

@@ -1,10 +1,11 @@
 class Admin::UsersController < Admin::ApplicationController
+  require 'csv'
 
   belongs_to_app :users
   add_breadcrumb "Users", :admin_users_path
   before_action :load_user, :only => [:edit, :update, :show, :destroy]
   after_action :send_credentials_email, :only => [:create, :update]
-  respond_to :html
+  respond_to :html, :csv
 
   def index
     @spud_users = SpudUser.ordered.paginate(:page => params[:page], :per_page => 15)
@@ -18,6 +19,13 @@ class Admin::UsersController < Admin::ApplicationController
     respond_with @user
   end
 
+  def export
+    users = SpudUser.all
+    export_columns = %w(created_at first_name last_name email last_login_at)
+    file_name = Spud::Core.site_name + ' Users Export.csv'
+    send_data users.as_csv(export_columns), :type => 'text/csv; charset=iso-8859-1; header=present', :disposition => "attachment; filename=#{file_name}"
+  end
+
   def new
     @user = SpudUser.new
     respond_with @user do |format|

data/app/controllers/user_sessions_controller.rb

@@ -13,16 +13,22 @@
   
   def create
     @user_session = SpudUserSession.new(params[:spud_user_session])
-    logged_in = @user_session.save()
-    respond_with @user_session do |format|
-      format.html{
-        if logged_in
+    if @user_session.save()
+      respond_with @user_session do |format|
+        format.html{
           flash[:notice] = "Login successful!"
           redirect_back_or_default('/')
-        else
+        }
+        format.json{
+          render json: {success: true}
+        }
+      end
+    else
+      respond_with @user_session do |format|
+        format.html{
           render 'new'
-        end
-      }
+        }
+      end
     end
   end
   

data/app/models/spud/spud_user_model.rb

@@ -36,6 +36,12 @@ class Spud::SpudUserModel < ActiveRecord::Base
     return "#{self.first_name} #{self.last_name}"
   end
 
+  def email_formatted
+    address = Mail::Address.new(email)
+    address.display_name = full_name
+    return address.format
+  end
+
   def full_name_with_email
     return "#{full_name} (#{email})"
   end
@@ -112,6 +118,15 @@ class Spud::SpudUserModel < ActiveRecord::Base
     end
   end
 
+  def self.as_csv(column_names, options = {})
+    CSV.generate do |csv|
+      csv << column_names
+      all.each do |item|
+        csv << item.attributes.values_at(*column_names)
+      end
+    end
+  end
+
 private
 
   def set_login_to_email

data/app/views/admin/users/_form.html.erb

@@ -2,7 +2,7 @@
 
   <%= tb_form_error_header(f.object) %>
 
-  <h4>User Details</h4>
+  <%= f.tb_sub_title 'User Details' %>
 
   <% if !Spud::Core.config.use_email_as_login %>
     <%= f.tb_text_field :login %>
@@ -14,7 +14,7 @@
 
   <%= render :partial => 'form_additions', :locals => {:f => f} %>
 
-  <h4>Credentials</h4>
+  <%= f.tb_sub_title 'Credentials' %>
 
   <%= f.tb_password_field :password %>
   <%= f.tb_password_field :password_confirmation %>
@@ -42,7 +42,7 @@
     </div>
   </div>
 
-  <h4>Permissions</h4>
+  <%= f.tb_sub_title 'Permissions' %>
 
   <%= f.tb_check_box :super_admin, :help_block => 'The super administrator bypasses all permissions and roles.' %>
   <%= f.tb_select :spud_role_id, options_from_collection_for_select(SpudRole.all, :id, :name, f.object.spud_role_id), {:include_blank => 'No Role'} %>

data/app/views/admin/users/index.html.erb

@@ -2,6 +2,7 @@
   <%= render :partial => '/layouts/admin/search', :locals => {:search_path => admin_users_path} %>
   <%= link_to 'Roles', admin_roles_path, :class => 'btn btn-default admin-role-btn' %>
   <%= link_to "New User", new_admin_user_path, :class => "btn btn-primary admin-user-add-btn", :title => "New User" %>
+  <%= link_to "Export", export_admin_users_path, :class => "btn btn-primary admin-user-add-btn", :title => "New User" %>
 <% end %>
 
 <%= content_for :detail do %>

data/config/routes.rb

@@ -12,7 +12,9 @@ Rails.application.routes.draw do
     put 'change_sort' => 'dashboard#change_sort'
 
     root :to => "dashboard#index"
-    resources :users, :controller
+    resources :users do
+      get 'export', :on => :collection
+    end
     resources :roles
 
     get 'setup' => 'setup#new'

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.3.7"
+    VERSION = "1.3.9"
   end
 end

data/spec/models/spud_user_spec.rb

@@ -24,6 +24,13 @@ describe SpudUser, :type => :model do
     end
   end
 
+  describe '#email_formatted' do
+    it 'should return an email formtted for sending' do
+      user = FactoryGirl.create(:spud_user)
+      expect(user.email_formatted).to eq("#{user.full_name} <#{user.email}>")
+    end
+  end
+
   it { should_not allow_value('').for(:login) }
   it { should validate_length_of(:login).is_at_least(3) }
   it { should validate_length_of(:password).is_at_least(4) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.9
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails