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

Fixes admin priviledge to stop work in activity #2167

Merged
merged 8 commits into from Sep 14, 2018

Conversation

Projects
None yet
4 participants
@SaptakS
Copy link
Contributor

commented Sep 6, 2018

Description

ensure that when a worker has applied -> funder/admin can ONLY approve / reject.
Upon being approved -> funder/admin would be able to stop work / stop work + ding repo

Checklist
  • linter status: 100% pass
  • changes don't break existing behavior
  • commit message follows commit guidelines
Affected core subsystem(s)
Testing
Refers/Fixes

Fixes #2165

@SaptakS SaptakS added the in progress label Sep 6, 2018

@SaptakS

This comment has been minimized.

Copy link
Contributor Author

commented Sep 6, 2018

Let's get this tested once on staging.

@codecov

This comment has been minimized.

Copy link

commented Sep 6, 2018

Codecov Report

Merging #2167 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2167   +/-   ##
=======================================
  Coverage   27.75%   27.75%           
=======================================
  Files         141      141           
  Lines       11367    11367           
  Branches     1543     1543           
=======================================
  Hits         3155     3155           
  Misses       8102     8102           
  Partials      110      110

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 44a1f0c...97ecd80. Read the comment docs.

@thelostone-mc
Copy link
Member

left a comment

LGTM! Haven't tested

by-mistake

@vs77bb

This comment has been minimized.

Copy link
Contributor

commented Sep 7, 2018

Happy to review when this is on staging, just lmk!

@thelostone-mc

This comment has been minimized.

Copy link
Member

commented Sep 12, 2018

@SaptakS wanna rebase and get it on staging ?

@SaptakS

This comment has been minimized.

Copy link
Contributor Author

commented Sep 12, 2018

@thelostone-mc your wish is my command. But next time add sudo before it.

@mbeacom

This comment has been minimized.

Copy link
Contributor

commented Sep 12, 2018

@SaptakS @thelostone-mc This is on staging.

<div class="stop-work">
<span title="<div class='tooltip-info tooltip-sm'>Remove this user's started work on the bounty and ding rep</div>">
<a id="remove-slash-[[:name]]" class="button button--primary admin-only" role="button" href="remove-handle">
<span class="font-smaller-4">Stop work + Ding Rep</span>

This comment has been minimized.

Copy link
@mbeacom

mbeacom Sep 13, 2018

Contributor

One thing here... should we modify the newly introduced copy to support i18n?

@SaptakS SaptakS force-pushed the SaptakS:fix/admin-actions branch from d8610b1 to c40acca Sep 14, 2018

SaptakS added some commits Sep 14, 2018

)
}],
},
{

This comment has been minimized.

Copy link
@mbeacom

mbeacom Sep 14, 2018

Contributor

Can you revert the indent change here?

null=True,
blank=True,
help_text=_('The Github avatar SVG.')
upload_to=get_upload_filename, null=True, blank=True, help_text=_('The Github avatar SVG.')

This comment has been minimized.

Copy link
@mbeacom

mbeacom Sep 14, 2018

Contributor

😅

@@ -44,8 +44,8 @@ class AvatarAdmin(GeneralAdmin):

ordering = ['-id']
fields = [
'config', 'use_github_avatar', 'svg_asset', 'custom_png_asset', 'github_svg_asset',
'png_asset', 'created_on', 'modified_on'
'config', 'use_github_avatar', 'svg_asset', 'custom_png_asset', 'github_svg_asset', 'png_asset', 'created_on',

This comment has been minimized.

Copy link
@mbeacom

mbeacom Sep 14, 2018

Contributor

👍

}, ]
},
{
'title': 'web => bounties_posted => bounties_fulfilled (detail)',

This comment has been minimized.

Copy link
@mbeacom

mbeacom Sep 14, 2018

Contributor

Can you revert the indent change here?

@mbeacom mbeacom merged commit c99642d into gitcoinco:master Sep 14, 2018

5 of 6 checks passed

codecov/patch 0% of diff hit (target 27.8%)
Details
ci/circleci Your tests passed on CircleCI!
Details
codebeat no reportable quality changes
Details
codecov/project 27.8% remains the same compared to 986b9d7
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
stickler-ci No lint errors found.

@mbeacom mbeacom removed the in progress label Sep 14, 2018

@SaptakS SaptakS deleted the SaptakS:fix/admin-actions branch Sep 14, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.