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

Update editor_controller.rb #11507

Merged
merged 2 commits into from
Oct 31, 2022
Merged

Conversation

AlphaRomeoMike
Copy link
Contributor

Removed 'and', replaced the logic with double ampersand

Fixes #11502 🎉🍾

Removed 'and', replaced the logic with double ampersand
This PR closes publiclab#11502
@AlphaRomeoMike AlphaRomeoMike requested a review from a team as a code owner October 18, 2022 08:54
@welcome
Copy link

welcome bot commented Oct 18, 2022

Thanks for opening this pull request! This space is protected by our Code of Conduct - and we're here to help.
Dangerbot will test out your code and reply in a bit with some pointers and requests.
Also please refer here for installation help 💿
There may be some errors, but don't worry! We'll work through them with you! 👍🎉😄


One thing that can help to get started is to make sure you've included a link back to the original issue you're solving, in the format fixes #0000 (for example). And to make sure the PR title describes what you're trying to do! (often it can be the same as the issue title) Thanks! 🙌


Then, you can say hello in our chatroom & share a link to this PR to get a review! 👋 ✅

@gitpod-io
Copy link

gitpod-io bot commented Oct 18, 2022

@@ -35,12 +35,12 @@ def rich
@main_image = Image.find_by(id: params[:main_image]).path
end

if params[:tags]&.include? "lat:" and params[:tags]&.include? "lon:"
if params[:tags]&.include? "lat:" && params[:tags]&.include? "lon:"
Copy link

Choose a reason for hiding this comment

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

unexpected token tSTRING
(Using Ruby 2.5 parser; configure using TargetRubyVersion parameter, under AllCops)

@codecov
Copy link

codecov bot commented Oct 18, 2022

Codecov Report

Merging #11507 (6b0efce) into main (a5d2483) will not change coverage.
The diff coverage is 25.00%.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main   #11507   +/-   ##
=======================================
  Coverage   83.33%   83.33%           
=======================================
  Files          93       93           
  Lines        5772     5772           
=======================================
  Hits         4810     4810           
  Misses        962      962           
Impacted Files Coverage Δ
app/controllers/editor_controller.rb 76.74% <25.00%> (ø)
app/models/user.rb 86.23% <0.00%> (-0.27%) ⬇️
app/controllers/home_controller.rb 95.58% <0.00%> (-0.07%) ⬇️
app/controllers/relationships_controller.rb 71.42% <0.00%> (ø)
app/controllers/spam2_controller.rb 72.54% <0.00%> (+0.70%) ⬆️

@IvyJeptoo
Copy link
Contributor

@AlphaRomeoMike can I help you out with the tests?

@AlphaRomeoMike
Copy link
Contributor Author

@AlphaRomeoMike can I help you out with the tests?

Yes please

@IvyJeptoo
Copy link
Contributor

@AlphaRomeoMike can I help you out with the tests?

Yes please

maybe you could send me a chat on the communication platform my username is briesta so that we can hop into a meet

@AlphaRomeoMike
Copy link
Contributor Author

@AlphaRomeoMike can I help you out with the tests?

Yes please

maybe you could send me a chat on the communication platform my username is briesta so that we can hop into a meet

I dont think I will be able to because of my busy schedule

@IvyJeptoo
Copy link
Contributor

@AlphaRomeoMike can I help you out with the tests?

Yes please

maybe you could send me a chat on the communication platform my username is briesta so that we can hop into a meet

I dont think I will be able to because of my busy schedule

How do you suggest I help you?

@AlphaRomeoMike
Copy link
Contributor Author

@AlphaRomeoMike can I help you out with the tests?

Yes please

maybe you could send me a chat on the communication platform my username is briesta so that we can hop into a meet

I dont think I will be able to because of my busy schedule

How do you suggest I help you?

Balaclava_Nerd#6566 on Discord

@IvyJeptoo
Copy link
Contributor

@AlphaRomeoMike can I help you out with the tests?

Yes please

maybe you could send me a chat on the communication platform my username is briesta so that we can hop into a meet

I dont think I will be able to because of my busy schedule

How do you suggest I help you?

Balaclava_Nerd#6566 on Discord

Great, sent!(Ivy J)

Copy link
Member

@TildaDares TildaDares left a comment

Choose a reason for hiding this comment

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

Hi @AlphaRomeoMike, lat: and lon: need to be wrapped in parentheses. The same thing applies to the other lines. Thank you!

app/controllers/editor_controller.rb Outdated Show resolved Hide resolved
@codeclimate
Copy link

codeclimate bot commented Oct 25, 2022

Code Climate has analyzed commit 6b0efce and detected 3 issues on this pull request.

Here's the issue category breakdown:

Category Count
Style 3

View more on Code Climate.

@github-actions
Copy link

This pull request generated screenshots of many common pages in the running app. You should be able to download and view them here:
https://github.com/publiclab/plots2/suites/8942803689/artifacts/410443645

Copy link
Member

@TildaDares TildaDares left a comment

Choose a reason for hiding this comment

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

Amazing work @AlphaRomeoMike. Thank you!

@cesswairimu cesswairimu mentioned this pull request Oct 26, 2022
5 tasks
@cesswairimu
Copy link
Collaborator

Looking great, thanks all, merging now.

@IvyJeptoo @AlphaRomeoMike would any of you like to open an issue and fix the code-climate warnings raised here? you can find the suggestions here https://codeclimate.com/github/publiclab/plots2/pull/11507, Its similar changes @TildaDares mentioned above.

@cesswairimu cesswairimu merged commit 7aadb93 into publiclab:main Oct 31, 2022
@welcome
Copy link

welcome bot commented Oct 31, 2022

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to PublicLab.org in the next few days, but first it will be published to https://stable.publiclab.org/ (it will take some minutes for this to load, and until then you may see logs from the build process). Please test out your work on this testing server and report back with a comment that all has gone well!
Do join our weekly check-in to share your this week goal and the awesome work you did 😃. Please find the link to our latest check-in here 📝
Now that you've completed this, you can help someone else take their first step!
Reach out to someone else working on theirs on Public Lab's code welcome page (where you'll now be featured as a recent contributor!). Thanks!

Help others take their first step

Now that you've merged your first pull request, you're the perfect person to help someone else out with this challenging first step. 🙌

https://code.publiclab.org

Try looking at this list of `first-timers-only` issues, and see if someone else is waiting for feedback, or even stuck! 😕

People often get stuck at the same steps, so you might be able to help someone get unstuck, or help lead them to some documentation that'd help. Reach out and be encouraging and friendly! 😄 🎉

Read about how to help support another newcomer here, or find other ways to offer mutual support here.

You can also join our Gitter channel to connect with other contributors 📥

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.

replace "and" with "&&" editor-controller
4 participants