Sitelet https://github.com/codeRIT/hackathon-manager/pull/181
Skip to content
This repository was archived by the owner on Mar 1, 2026. It is now read-only.

feat: Display sign-in info on the admin detail & admin table list - #181

Merged
dquach217 merged 7 commits into
masterfrom
issue_128
Aug 25, 2019
Merged

dquach217 merged 7 commits into
masterfrom
issue_128

Conversation

@dquach217

Copy link
Copy Markdown
Contributor

Fixes #128

@dquach217
dquach217 requested a review from sman591 August 18, 2019 09:22
Comment thread app/datatables/admin_datatable.rb Outdated
@dquach217 dquach217 changed the title [WIP] Feature: Display information on the Admin Detail Page & Admin Data Table Feature: Display information on the Admin Detail Page & Admin Data Table Aug 21, 2019
@sman591 sman591 changed the title Feature: Display information on the Admin Detail Page & Admin Data Table feat: Display sign-in info on the admin detail & admin table list Aug 24, 2019

@sman591 sman591 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Few small tweaks then good to go

Comment thread app/assets/javascripts/manage/lib/setupDataTables.js Outdated
Comment thread app/datatables/admin_datatable.rb Outdated
Comment thread app/views/manage/admins/index.html.haml Outdated
Comment thread app/views/manage/admins/index.html.haml Outdated
Comment thread app/views/manage/admins/index.html.haml Outdated
Comment thread app/views/manage/admins/index.html.haml Outdated
Comment thread app/views/manage/admins/show.html.haml Outdated
Comment thread app/datatables/admin_datatable.rb Outdated
Comment thread app/datatables/admin_datatable.rb Outdated
Comment thread app/datatables/admin_datatable.rb Outdated
@dquach217

Copy link
Copy Markdown
Contributor Author

@sman591 I finished applying all changes requested

@sman591 sman591 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like tests are currently failing because display_datetime is incompatible with nil values... if you add this to the beginning of https://github.com/codeRIT/hackathon-manager/blob/master/app/helpers/hackathon_manager_helper.rb#L94 it should fix it:

if datetime.blank?
  return ""
end

@dquach217
dquach217 merged commit f0be0e3 into master Aug 25, 2019
@peterkos
peterkos deleted the issue_128 branch May 30, 2020 02:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Show current & last login on admin detail page, maybe admin list table as well

3 participants