Merge pull request #1059 from CDLUC3/edit_user_privileges
Edit User privileges as a Super Admin (#794) and Org Admin (#761)
dev
commit 1e31229719f0d3c91762f124f3dad758066cb3d3
2 parents 78fc651 + 804d024
@Brian Riley Brian Riley authored on 18 Jan 2018
GitHub committed on 18 Jan 2018
Showing 9 changed files
View
app/controllers/users_controller.rb
View
app/views/paginable/users/_index.html.erb
View
app/views/users/_admin_grant_permissions.html.erb 0 → 100644
View
app/views/users/admin_grant_permissions.html.erb 100644 → 0
View
app/views/users/admin_index.html.erb
View
lib/assets/javascripts/application.js
View
lib/assets/javascripts/views/users/admin_grant_permissions.js 0 → 100644
View
lib/assets/javascripts/views/users/notification_preferences.js
View
lib/assets/stylesheets/overrides.scss