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

Allow moderation to potentially change photos. #2291

Merged
merged 4 commits into from
Oct 22, 2018
Merged

Conversation

dracos
Copy link
Member

@dracos dracos commented Oct 15, 2018

Lets a cobrand provide a standard photo upload form (as on new report/update) in the report display so moderation can add/remove photos to a report, not just show/hide.

@ghost ghost assigned dracos Oct 15, 2018
@ghost ghost added the Reviewing label Oct 15, 2018
@codecov
Copy link

codecov bot commented Oct 15, 2018

Codecov Report

Merging #2291 into master will decrease coverage by 0.08%.
The diff coverage is 75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2291      +/-   ##
==========================================
- Coverage   80.24%   80.16%   -0.09%     
==========================================
  Files         187      187              
  Lines       12039    12035       -4     
  Branches     2224     2224              
==========================================
- Hits         9661     9648      -13     
- Misses       1617     1630      +13     
+ Partials      761      757       -4
Impacted Files Coverage Δ
perllib/FixMyStreet/TestMech.pm 92.63% <ø> (-0.15%) ⬇️
...erllib/FixMyStreet/App/Controller/Report/Update.pm 90.5% <100%> (ø) ⬆️
perllib/FixMyStreet/App/Controller/My.pm 83.09% <100%> (ø) ⬆️
perllib/FixMyStreet/App/Controller/Moderate.pm 87.5% <66.66%> (-1.39%) ⬇️
perllib/FixMyStreet/App/Controller/Report.pm 92.14% <76.47%> (+1.67%) ⬆️
perllib/FixMyStreet/Map/FMS.pm 33.33% <0%> (-38.89%) ⬇️
perllib/FixMyStreet/Map/Bing.pm 15.78% <0%> (-10.53%) ⬇️
perllib/FixMyStreet/App/Controller/Develop.pm 88.42% <0%> (-5.27%) ⬇️
perllib/FixMyStreet/App/Model/PhotoSet.pm 39.28% <0%> (+2.38%) ⬆️
perllib/FixMyStreet/PhotoStorage/FileSystem.pm 86.66% <0%> (+3.33%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update adb976c...70b83e9. Read the comment docs.

@dracos dracos force-pushed the add-photo-to-report branch 3 times, most recently from 3b341b6 to d7d6f99 Compare October 16, 2018 10:59
@dracos dracos requested a review from struan October 16, 2018 12:47
Copy link
Member

@struan struan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small comments but this looks good.

$c->forward('/photo/process_photo');
#if ( my $photo_error = delete $c->stash->{photo_error} ) {
# What to do here?
#}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be resolved?

t/app/controller/moderate.t Show resolved Hide resolved
@dracos dracos requested a review from struan October 17, 2018 11:51
@dracos
Copy link
Member Author

dracos commented Oct 17, 2018

Some fixups for the error, test, and then to prevent clashes with the update photo upload (both JS only looking for one form, and server not putting the problem photos in the update photo upload preview).

Copy link
Member

@struan struan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this could do with a link to an example of how to add it somewhere because it's not entirely obvious. But that's a small point. Looks good otherwise.

@dracos dracos merged commit c73e8b5 into master Oct 22, 2018
@dracos dracos removed the Reviewed label Oct 22, 2018
@dracos dracos temporarily deployed to github-pages October 22, 2018 19:06 Inactive
@dracos dracos temporarily deployed to github-pages October 22, 2018 19:20 Inactive
@dracos dracos temporarily deployed to github-pages October 22, 2018 19:46 Inactive
@dracos dracos temporarily deployed to github-pages October 22, 2018 20:24 Inactive
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