Skip to content
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

Production deployment 6th July 2022 #1379

Merged
merged 5 commits into from
Jul 7, 2022
Merged

Production deployment 6th July 2022 #1379

merged 5 commits into from
Jul 7, 2022

Conversation

ivankocienski
Copy link
Contributor

@ivankocienski ivankocienski commented Jul 6, 2022

#1363 partner opening times data can have invalid JSON

Some of the data in partner opening_times fields was badly formed.

With badly formed JSON data:

with bad JSON data

With valid JSON data:

with valid JSON data

#1364 No rights message on admin dashboard and profile page

When citizens log in and have no tags, neighbourhoods or partners they should see a message on the dashboard and their profile page. This is not the case if the user has the root role.

Dashboard home screen:

Dashboard home screen

Profile page (bottom):

Profile page

#1369 Articles on sites news page can be found by location (address) and tag

When an article has the foo tag applied and a site has a foo tag in its selected tags field, then that article should appear on the site, regardless of location. This is in addition to the previous behaviour of finding articles published from partners that have neighbourhoods in the Site's neighbourhoods.

Articles found by both tag and address

Screen Shot 2022-07-06 at 15 42 34

#1368 Blank editors don't see 'no content' warning (from #1364)

As an extension of 1364: users with editor roles do not see the blank content warning.

As a blank citizen:

blank-citizen

As a blank root:

blank-root

As a blank editor:

Screen Shot 2022-07-06 at 15 55 46

ivankocienski and others added 5 commits June 29, 2022 09:56
Article::for_site finds by tag and neighbourhood

and documentation/tests of Article.with_site scope
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md)
- [Commits](rails/rails-html-sanitizer@v1.4.2...v1.4.3)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ivan Kocienski <ivan.kocienski@gmail.com>
* Don't show root users the no-content warning

When logged in as a root user (who has no content)
and on the home dashboard page
then don't show the no content nag box

Also: users who are editors have content even if they have no tags,
neighbourhoods or partners. Like root users.
@ivankocienski ivankocienski marked this pull request as ready for review July 6, 2022 15:31
@kimadactyl kimadactyl merged commit 8c15513 into production Jul 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants