Sam's fix for the API token issue (#11)
* added data structures for testing

* renamed token_permission_type to plural to follow convention of fixtures

* added gem to allow testing of controllers

* began implimenting testing for projects controller

* fixed auth to reject empty string

* added data structures for testing

* added data structures for testing

* removed old unnecissary data structures from fixtures

* added forgotten view for org-admins giving user's api permissions

* updated .gitignore

* added gem to allow testing of controllers

* began implimenting testing for projects controller

* fixed auth to reject empty string

* added data structures for testing

* added data structures for testing

* removed old unnecissary data structures from fixtures

* added forgotten view for org-admins giving user's api permissions

* updated .gitignore

* fixed leftover merge conflict in .gitignore

* updated org-admin view of users for rails 4.2 compatability

* fiexed a bug where user's api token permissions wouldnt display

* fixed syntax error

* changed guidance_group to guidance_groups for consistancy with api spec

* fix roadmap route

* bugfixing auth for api

* removed token_permission as it was accidentially re-added by a merge

* added gem to allow testing of controllers

* began implimenting testing for projects controller

* fixed auth to reject empty string

* added data structures for testing

* added data structures for testing

* removed old unnecissary data structures from fixtures

* added forgotten view for org-admins giving user's api permissions

* updated .gitignore

* removed old unnecissary data structures from fixtures

* updated .gitignore

* updated org-admin view of users for rails 4.2 compatability

* fiexed a bug where user's api token permissions wouldnt display

* fixed syntax error

* changed guidance_group to guidance_groups for consistancy with api spec

* bugfixing auth for api

* modified schema

* removed admin interface to token_permission, another forgotten side-effect

* removed admin interface to token_permission, another forgotten side-effect
dev
1 parent 6ce7e04 commit 63fd0a386daee75edc16a7536c562e69078d49a7
@Jimmy Angelakos Jimmy Angelakos authored on 28 Jul 2016
Brian Riley committed on 28 Jul 2016
Showing 22 changed files
View
.gitignore
View
Gemfile
View
app/admin/token_permission.rb 100644 → 0
View
app/controllers/api/v0/base_controller.rb
View
app/controllers/api/v0/guidance_groups_controller.rb
View
app/controllers/token_permission_types_controller.rb
View
app/mailers/user_mailer.rb
View
app/models/token_permission.rb 100644 → 0
View
app/models/user.rb
View
app/views/api/v0/guidance_groups/index.json.jbuilder
View
app/views/users/admin_api_update.html.erb 0 → 100644
View
app/views/users/admin_index.html.erb
View
config/routes.rb
View
db/schema.rb
View
test/fixtures/dmptemplates_guidance_groups.yml 100644 → 0
View
test/fixtures/guidances.yml
View
test/fixtures/org_token_permissions.yml 0 → 100644
View
test/fixtures/token_permission.yml 100644 → 0
View
test/fixtures/token_permission_type.yml 100644 → 0
View
test/fixtures/user_org_roles.yml
View
test/fixtures/users.yml
View
test/functional/api_projects_controller_test.rb 0 → 100644