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

Display alert on "candidate" activity posts with prompt to "adapt" them, fixes #839 #1078

Merged
merged 2 commits into from
Dec 7, 2016

Conversation

500swapnil
Copy link
Collaborator

@500swapnil 500swapnil commented Dec 7, 2016

Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!

  • all tests pass -- rake test:all
  • code is in uniquely-named feature branch, and has been rebased on top of latest master (especially if you've been asked to make additional changes)
  • pull request is descriptively named with #number reference back to original issue
  • if possible, multiple commits squashed if they're smaller changes
  • reviewed/confirmed/tested by another contributor or maintainer
  • schema.rb.example has been updated if any database migrations were added

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/wiki/contributing-to-public-lab-software

We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays. Please alert developers on plots-dev@googlegroups.com when your request is ready or if you need assistance.

Thanks!

@@ -2,6 +2,7 @@

<div class="col-md-9 note-show<% if @node.status == 4 || @node.status == 0 %> moderated<% end %>">
<% if current_user && @node.tags.length == 0 %><div class="alert alert-warning"><%= raw t('notes.show.note_no_tags') %></div><% end %>
<% if @node.has_power_tag('status:candidate') %><div class="alert alert-info"><a href="https://publiclab.org/notes/warren/09-17-2016/what-makes-a-good-activity" >read about how to adapt its content</a></div>
Copy link
Member

Choose a reason for hiding this comment

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

Ah - actually we should have this whole line -- sorry i wasn't specific enough and thank you!

This was marked as a candidate activity -- read about how to adapt its content into a fully-fledged, step-by-step activity that can be easily replicated.

@jywarren jywarren changed the title Display alert on "candidate" activity posts with prompt to "adapt" them #839 Display alert on "candidate" activity posts with prompt to "adapt" them, fixes #839 Dec 7, 2016
@jywarren
Copy link
Member

jywarren commented Dec 7, 2016

Also note how I added fixes #839 -- having that word in the title or commit message will auto-close the issue when it's merged -- magical! 🎩 🐇

@500swapnil
Copy link
Collaborator Author

Okay I will add it. Thanks!

@jywarren
Copy link
Member

jywarren commented Dec 7, 2016

Super! Thanks!

@jywarren jywarren merged commit 91efde9 into publiclab:master Dec 7, 2016
@500swapnil
Copy link
Collaborator Author

But why was it failing tests?

@jywarren
Copy link
Member

jywarren commented Dec 7, 2016

Oh, i'm not sure but manually checking it showed that it's OK -- you know, actually I think merging too fast can cause it to fail since it may no longer be able to access the code from the pull request.

I guess i should always let them run through before merging.

Tests will run on master automatically though so it's OK!

Curious - do you think this could be an interesting next one to try? #397

@jywarren
Copy link
Member

jywarren commented Dec 7, 2016

It's multi-part, and a bit more complex, but I think you've gotten the idea of power tags well, and are ready for something like that -- and I'm happy to help!

@500swapnil
Copy link
Collaborator Author

I can have a look at it. Thanks!

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