Browse code Merge pull request #1303 from CDLUC3/issue1275 Updates to Super Admin Users page dev
commit 8f453a063bd07b8de7ed1847d16545fe0c37d827 2 parents e2e1057 + 77014f5 Jose Lloret authored on 20 Mar 2018 GitHub committed on 20 Mar 2018

Showing 27 changed files

• app/controllers/super_admin/orgs_controller.rb
• app/controllers/super_admin/users_controller.rb
• app/controllers/users_controller.rb
• app/mailers/user_mailer.rb
• app/models/user.rb
• app/policies/user_policy.rb
• app/views/paginable/users/_index.html.erb
• app/views/shared/_my_org.html.erb
• app/views/super_admin/users/edit.html.erb
• app/views/users/_admin_grant_permissions.html.erb
• config/locales/devise/devise.de.yml
• config/locales/devise/devise.en_GB.yml
• config/locales/devise/devise.en_US.yml
• config/locales/devise/devise.es.yml
• config/locales/devise/devise.fr.yml
• config/routes.rb
• db/migrate/20180315161757_add_active_to_users.rb
• db/schema.rb
• lib/assets/javascripts/application.js
• lib/assets/javascripts/utils/autoComplete.js
• lib/assets/javascripts/views/super_admin/users/edit.js
• lib/assets/javascripts/views/users/admin_grant_permissions.js
• lib/assets/stylesheets/overrides.scss
• test/functional/super_admin/orgs_controller_test.rb
• test/functional/super_admin/users_controller_test.rb
• test/integration/user_activation_test.rb
• test/unit/user_test.rb

Ignore Space Show notes View app/controllers/super_admin/orgs_controller.rb

Ignore Space Show notes View app/controllers/super_admin/users_controller.rb 0 → 100644

Ignore Space Show notes View app/controllers/users_controller.rb

Ignore Space Show notes View app/mailers/user_mailer.rb

Ignore Space Show notes View app/models/user.rb

Ignore Space Show notes View app/policies/user_policy.rb

Ignore Space Show notes View app/views/paginable/users/_index.html.erb

Ignore Space Show notes View app/views/shared/_my_org.html.erb

Ignore Space Show notes View app/views/super_admin/users/edit.html.erb 0 → 100644

Ignore Space Show notes View app/views/users/_admin_grant_permissions.html.erb

Ignore Space Show notes View config/locales/devise/devise.de.yml

Ignore Space Show notes View config/locales/devise/devise.en_GB.yml

Ignore Space Show notes View config/locales/devise/devise.en_US.yml

Ignore Space Show notes View config/locales/devise/devise.es.yml

Ignore Space Show notes View config/locales/devise/devise.fr.yml

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20180315161757_add_active_to_users.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View lib/assets/javascripts/application.js

Ignore Space Show notes View lib/assets/javascripts/utils/autoComplete.js

Ignore Space Show notes View lib/assets/javascripts/views/super_admin/users/edit.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/views/users/admin_grant_permissions.js

Ignore Space Show notes View lib/assets/stylesheets/overrides.scss

Ignore Space Show notes View test/functional/super_admin/orgs_controller_test.rb

Ignore Space Show notes View test/functional/super_admin/users_controller_test.rb 0 → 100644

Ignore Space Show notes View test/integration/user_activation_test.rb 0 → 100644

Ignore Space Show notes View test/unit/user_test.rb

Show line notes below