-
Notifications
You must be signed in to change notification settings - Fork 5
Add flag to identify school as linked to excs #546
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
danhalson
merged 6 commits into
main
from
issues/543-Add_flag_to_identify_school_as_linked_to_ExCS
May 24, 2025
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f49b045
543: Add enum to capture user_origin
danhalson f9fe950
543: Add school template in views
danhalson 2a2c255
543: Derive list from enum values
danhalson 9d6c697
543: operations that 'show' a school should return the user_origin
danhalson 9044c24
543: Don't restrict values at the param level
danhalson ab74f4d
543: Rename migration
danhalson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,20 +1,3 @@ | ||
# frozen_string_literal: true | ||
|
||
json.call( | ||
@school, | ||
:id, | ||
:name, | ||
:website, | ||
:reference, | ||
:address_line_1, | ||
:address_line_2, | ||
:municipality, | ||
:administrative_area, | ||
:postal_code, | ||
:country_code, | ||
:code, | ||
:verified_at, | ||
:created_at, | ||
:updated_at | ||
) | ||
json.roles @user.school_roles(@school) | ||
json.partial! '/api/schools/school', school: @school, roles: @user.school_roles(@school), code: true | ||
This file contains hidden or 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 hidden or 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 |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# frozen_string_literal: true | ||
|
||
json.call( | ||
school, | ||
:id, | ||
:name, | ||
:website, | ||
:reference, | ||
:address_line_1, | ||
:address_line_2, | ||
:municipality, | ||
:administrative_area, | ||
:postal_code, | ||
:country_code, | ||
:verified_at, | ||
:created_at, | ||
:updated_at | ||
) | ||
|
||
include_roles = local_assigns.fetch(:roles, false) | ||
json.roles(roles) if include_roles | ||
|
||
include_code = local_assigns.fetch(:code, false) | ||
json.code(school.code) if include_code | ||
|
||
include_user_origin = local_assigns.fetch(:user_origin, false) | ||
json.user_origin(school.user_origin) if include_user_origin |
This file contains hidden or 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,20 +1,5 @@ | ||
# frozen_string_literal: true | ||
|
||
json.array!(@schools) do |school| | ||
json.call( | ||
school, | ||
:id, | ||
:name, | ||
:website, | ||
:reference, | ||
:address_line_1, | ||
:address_line_2, | ||
:municipality, | ||
:administrative_area, | ||
:postal_code, | ||
:country_code, | ||
:verified_at, | ||
:created_at, | ||
:updated_at | ||
) | ||
json.partial! 'school', school: | ||
danhalson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
end |
This file contains hidden or 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,18 +1,3 @@ | ||
# frozen_string_literal: true | ||
|
||
json.call( | ||
@school, | ||
:id, | ||
:name, | ||
:website, | ||
:reference, | ||
:address_line_1, | ||
:address_line_2, | ||
:municipality, | ||
:administrative_area, | ||
:postal_code, | ||
:country_code, | ||
:verified_at, | ||
:created_at, | ||
:updated_at | ||
) | ||
json.partial! 'school', school: @school, user_origin: true |
5 changes: 5 additions & 0 deletions
5
db/migrate/20250515081023_add_user_origin_field_to_schools.rb
This file contains hidden or 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 |
---|---|---|
@@ -0,0 +1,5 @@ | ||
class AddUserOriginToSchools < ActiveRecord::Migration[7.1] | ||
def change | ||
add_column :schools, :user_origin, :integer, default: 0 | ||
end | ||
end |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.