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

SaptakS
Copy link
Contributor

@SaptakS SaptakS 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
Copy link
Contributor Author

SaptakS commented Sep 6, 2018

Let's get this tested once on staging.

@codecov
Copy link

codecov bot 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
thelostone-mc previously approved these changes Sep 6, 2018
Copy link
Member

@thelostone-mc thelostone-mc left a comment

Choose a reason for hiding this comment

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

LGTM! Haven't tested

@vs77bb
Copy link
Contributor

vs77bb commented Sep 7, 2018

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

@thelostone-mc
Copy link
Member

@SaptakS wanna rebase and get it on staging ?

@SaptakS
Copy link
Contributor Author

SaptakS commented Sep 12, 2018

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

@mbeacom
Copy link
Contributor

mbeacom commented Sep 12, 2018

@SaptakS @thelostone-mc This is on staging.

thelostone-mc
thelostone-mc previously approved these changes Sep 13, 2018
<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>
Copy link
Contributor

Choose a reason for hiding this comment

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

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

)
}],
},
{
Copy link
Contributor

Choose a reason for hiding this comment

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

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.')
Copy link
Contributor

Choose a reason for hiding this comment

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

😅

@@ -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',
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

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

Choose a reason for hiding this comment

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

Can you revert the indent change here?

@mbeacom mbeacom merged commit c99642d into gitcoinco:master Sep 14, 2018
@SaptakS SaptakS deleted the fix/admin-actions branch September 14, 2018 23:52
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.

No 'Stop Work' / 'Stop Work & Ding Rep'
4 participants