From dbaf23a3ac032ff986d9901d2c6caf47bf494a60 Mon Sep 17 00:00:00 2001 From: Jeremy Rudman Date: Mon, 4 Jan 2021 23:26:34 -0500 Subject: [PATCH 1/4] vcs url error now displayed in edit application page changed from redirect_to to render "edit" on error. redirect_to makes a fresh request which causes the error information to be lost --- app/controllers/questionnaires_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/questionnaires_controller.rb b/app/controllers/questionnaires_controller.rb index 0aed9e76f..ef52280b3 100644 --- a/app/controllers/questionnaires_controller.rb +++ b/app/controllers/questionnaires_controller.rb @@ -83,13 +83,13 @@ def create def update update_params = questionnaire_params update_params = convert_school_name_to_id(update_params) - + @agreements = Agreement.all respond_to do |format| if @questionnaire.update_attributes(update_params) format.html { redirect_to questionnaires_path, notice: 'Application was successfully updated.' } format.json { head :no_content } else - format.html { redirect_to edit_questionnaires_url } + format.html { render action: "edit" } format.json { render json: @questionnaire.errors, status: :unprocessable_entity } end end From 2a4b845b34b5a11e5f833046016ebf1db4ee83bd Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Sat, 2 Jan 2021 23:27:50 -0500 Subject: [PATCH 2/4] build: Reduces CHECKS attempts to 100 from 300 (#495) --- CHECKS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHECKS b/CHECKS index 24d7a521f..00dbaece8 100644 --- a/CHECKS +++ b/CHECKS @@ -1,4 +1,4 @@ WAIT=10 -ATTEMPTS=300 +ATTEMPTS=100 /users/sign_in Sign in to From 06ccbaf988bbdebfe8a792007f4e974f9d6e2861 Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Sun, 3 Jan 2021 00:20:15 -0500 Subject: [PATCH 3/4] build: Updates GitHub Actions to work on all version branches (#509) --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b340e8c3..7208272d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,8 @@ on: branches: - master - develop + - '[0-9].[0-9]' + - '[0-9].[0-9].[0-9]' jobs: build: From 1dbaa7de047748ed81be882b0d8942cc6339476c Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Mon, 4 Jan 2021 20:02:43 -0500 Subject: [PATCH 4/4] feature: Adds Users & Staff docs (#497) --- docs/docs-overview.md | 1 + docs/users-and-staff.md | 72 +++++++++++++++++++++++++++++++++++++++++ website/sidebars.json | 2 +- 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 docs/users-and-staff.md diff --git a/docs/docs-overview.md b/docs/docs-overview.md index 00554b945..1f958790e 100755 --- a/docs/docs-overview.md +++ b/docs/docs-overview.md @@ -12,6 +12,7 @@ Documentation to get you started: - [Questionnaires](questionnaires.md) - [Messages](messages.md) - [Bus Lists](busses.md) +- [Users & Staff](users-and-staff.md) - _More to come..._ ## Timeline of a hackathon diff --git a/docs/users-and-staff.md b/docs/users-and-staff.md new file mode 100644 index 000000000..a701ce205 --- /dev/null +++ b/docs/users-and-staff.md @@ -0,0 +1,72 @@ +--- +id: users-and-staff +title: Users & Staff +--- + +**Accessible by:** Directors + +The Users & Staff page is an easy way to manage the users of your hackathon's HackathonManager instance. In addition to attendees, you can also manage volunteers, organizers and directors. + +## User Management +Certain attributes within a user can be modified. + +**Email:** The email for the user, used for signing into HackathonManager. +**Role:** Role for the user, see [Roles](#roles). +**Login access:** Allow/Block login for that specific user. Will also disable the weekly report email if that user is an admin. +**Receive weekly report:** A weekly email report on admissions, bus lists, and messages. Only sent when there are weekly updates up until 7 days past the event. + + +## Roles +Roles allow for organization and permission access for users. There are four roles within HackathonManager: **User**, **Volunteer**, **Organizer** and **Director** with Director being the highest. + +### Permissions +The following are permissions for all admin roles. An admin role is any role other than User that has access to the admin dashboard. User can only create, view, edit and delete their own questionnaire. + +| | Volunteer | Organizer | Director | +|---|:-:|:-:|:-:| +| `View Questionnaires` | ✔️ | ✔️ | ✔️ | +| `Create Questionnaires` | | | ✔️ | +| `Update Questionnaires` | | | ✔️ | +| `Destroy Questionnaires` | | | ✔️ | +| `Check in Hackers` | ✔️ | ✔️ | ✔️ | +| `View Messages` | | ✔️ | ✔️ | +| `Modify Message Triggers` | | | ✔️ | +| `Send Messages` | | | ✔️ | +| `Create Messages` | | | ✔️ | +| `Update Messages` | | | ✔️ | +| `Destroy Messages` | | | ✔️ | +| `View Statistics` | | ✔️ | ✔️ | +| `View Trackable Tags` | | ✔️ | ✔️ | +| `(API) View Trackable Tags` | ✔️ | ✔️ | ✔️ | +| `Create Trackable Tags` | | | ✔️ | +| `Update Trackable Tags` | | | ✔️ | +| `Destroy Trackable Tags` | | | ✔️ | +| `View [own] Trackable Events` | ✔️ | ✔️ | ✔️ | +| `View [other] Trackable Events` | | ✔️ | ✔️ | +| `Create Trackable Events` | ✔️ | ✔️ | ✔️ | +| `Destroy [own] Trackable Events` | ✔️ | ✔️ | ✔️ | +| `Destroy [other] Trackable Events`| | | ✔️ | +| `View Schools` | ✔️ | ✔️ | ✔️ | +| `Create Schools` | | | ✔️ | +| `Update Schools` | | | ✔️ | +| `Merge Schools` | | | ✔️ | +| `Message Schools` | | | ✔️ | +| `View Users & Staff` | | | ✔️ | +| `Update Users & Staff` | | | ✔️ | +| `Destroy Users & Staff` | | | ✔️ | +| `Modify Account Role` | | | ✔️ | +| `View Legal Agreements` | | | ✔️ | +| `Update Legal Agreements` | | | ✔️ | +| `Destroy Legal Agreements` | | | ✔️ | +| `View Hackathon Settings` | | | ✔️ | +| `Update Hackathon Settings` | | | ✔️ | +| `View App Authentication` | | | ✔️ | +| `Create OAuth2 Applications` | | | ✔️ | +| `Update OAuth2 Applications` | | | ✔️ | +| `Destroy OAuth2 Applications` | | | ✔️ | +| `View Sidekiq` | | | ✔️ | +| `View Blazer` | | | ✔️ | +| `View Data Exports` | | | ✔️ | +| `Export Hackathon Data` | | | ✔️ | +_Own:_ Objects/events that were created by that user. +_Other:_ Objects/events that were created by any user. \ No newline at end of file diff --git a/website/sidebars.json b/website/sidebars.json index b13d9cfc6..9e9ecfa99 100755 --- a/website/sidebars.json +++ b/website/sidebars.json @@ -12,7 +12,7 @@ "updating-hm", "2.0-whats-new" ], - "Docs": ["docs-overview", "questionnaires", "messages", "busses"], + "Docs": ["docs-overview", "questionnaires", "messages", "busses", "users-and-staff"], "API": ["api-overview", "api-testing-setup"], "Getting Help": ["resources"] }