-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* created user role column * authentication login test * Added in initial changes for authentication * Small changes to spelling and role declaration * Reverse permissions * Added reverse changes to other sections for readability * changed unless to if for the scope in users * deleted admin_user.rb files * Testing * Testing * Testing changes * Changing permissions for users * Edits * deleted admin_user.rb from models * Modified the New User page so admins can set roles when creating new users * Prevented users from being created with null role value * update schema file * removed extra roles column * rubocop style fixes * boolean changes in user.rb * revert users.rb change * now blocks access to team_switch requests, redirecting to back page * comments on teamswitch requests * Add dropdown to select user role when creating new user (#38) * Modified the New User page so admins can set roles when creating new users * Prevented users from being created with null role value * update schema file * removed extra roles column * rubocop style fixes * rubocop autocorrect * added roles to dancer_test * added id to dancers to force unique constraint * added usernames to users.yml to fix unique constraint * all dancers tests pass * Non-admin users can no longer access team switch request page and users page (#41) * style fixes * redirects to dashboard page when user tries to access team switch request * block viewing users for directors, can't change own password if director * Only Show Team Switch Requests/Users Buttons for Admin (#40) * changed unless to if * test - switched true/false for can view * migrations * only add to menu if user is admin * used guard clause and fixed circleci * hide user button for nonadmin * style fix avoiding guard clause * fixed unexpected end * indentation style fix * extra line rubocop fix * add question mark to users * slight syntax
- Loading branch information
1 parent
b3d9823
commit 3aed549
Showing
30 changed files
with
447 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,25 @@ | ||
{ | ||
"[html.erb]": { | ||
"editor.detectIndentation": false, | ||
"editor.insertSpaces": true, | ||
"editor.tabSize": 2, | ||
}, | ||
"[ruby]": { | ||
"editor.detectIndentation": false, | ||
"editor.insertSpaces": true, | ||
"editor.tabSize": 2, | ||
}, | ||
|
||
"editor.insertSpaces": true, | ||
"editor.rulers": [100], | ||
"editor.tabSize": 2, | ||
"editor.wordWrap": "bounded", | ||
"editor.wordWrapColumn": 100, | ||
"files.insertFinalNewline": true, | ||
"files.trimFinalNewlines": true, | ||
"files.trimTrailingWhitespace": true, | ||
"workbench.editor.closeOnFileDelete": false, | ||
|
||
// https://code.visualstudio.com/docs/editor/integrated-terminal | ||
"terminal.integrated.shell.windows": "C:\\Windows\\System32\\bash.exe", | ||
} | ||
{ | ||
"[html.erb]": { | ||
"editor.detectIndentation": false, | ||
"editor.insertSpaces": true, | ||
"editor.tabSize": 2, | ||
}, | ||
"[ruby]": { | ||
"editor.detectIndentation": false, | ||
"editor.insertSpaces": true, | ||
"editor.tabSize": 2, | ||
}, | ||
|
||
"editor.insertSpaces": true, | ||
"editor.rulers": [100], | ||
"editor.tabSize": 2, | ||
"editor.wordWrap": "bounded", | ||
"editor.wordWrapColumn": 100, | ||
"files.insertFinalNewline": true, | ||
"files.trimFinalNewlines": true, | ||
"files.trimTrailingWhitespace": true, | ||
"workbench.editor.closeOnFileDelete": false, | ||
|
||
// https://code.visualstudio.com/docs/editor/integrated-terminal | ||
"terminal.integrated.shell.windows": "C:\\Windows\\System32\\bash.exe", | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.