Skip to content

Commit

Permalink
query activated for members
Browse files Browse the repository at this point in the history
  • Loading branch information
hpyhacking committed Apr 23, 2014
1 parent 0897db8 commit 6f15736
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 36 deletions.
34 changes: 0 additions & 34 deletions app/grids/statistic/members_grid.rb

This file was deleted.

2 changes: 1 addition & 1 deletion app/models/member.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def locate_email(auth_hash)
end

def create_from_auth(auth_hash)
member = create(email: auth_hash['info']['email'])
member = create(email: auth_hash['info']['email'], activated: false)
member.add_auth(auth_hash)
member
end
Expand Down
6 changes: 5 additions & 1 deletion app/views/admin/statistic/members/show.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
.panel-body
= search_form_for @q do |f|
= f.label :email_cont
= f.text_field :email_cont
= f.text_field :email_cont, autocomplete: :off
= f.label :activated_eq
= f.select :activated_eq, options_for_select({'YES' => true, 'NO' => false}, @q.activated_eq), include_blank: 'Oops'
hr.split
= f.submit
.col-md-19
.panel.panel-primary
Expand All @@ -15,6 +18,7 @@
.panel-body
= table_for(@members, class: 'table table-condensed table-hover', model: Member) do |t|
- t.column :id, class: 'col-md-1'
- t.column :name, class: 'col-md-1'
- t.column :email, class: 'col-md-2' do |x|
code.text-info = x.email
- t.column :created_at, class: 'col-md-3'
Expand Down

0 comments on commit 6f15736

Please sign in to comment.