|
Merge pull request #1059 from CDLUC3/edit_user_privileges
Edit User privileges as a Super Admin (#794) and Org Admin (#761) |
|---|
| app/controllers/users_controller.rb |
|---|
| app/views/paginable/users/_index.html.erb |
|---|
| app/views/users/_admin_grant_permissions.html.erb 0 → 100644 |
|---|
| app/views/users/admin_grant_permissions.html.erb 100644 → 0 |
|---|
| app/views/users/admin_index.html.erb |
|---|
| lib/assets/javascripts/application.js |
|---|
| lib/assets/javascripts/views/users/admin_grant_permissions.js 0 → 100644 |
|---|
| lib/assets/javascripts/views/users/notification_preferences.js |
|---|
| lib/assets/stylesheets/overrides.scss |
|---|