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.

Sign up for GitHub

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

Jump to bottom

Fix map of maps #354

Merged
merged 1 commit into from
Feb 21, 2019
Merged

Fix map of maps #354

merged 1 commit into from
Feb 21, 2019

Conversation

kaustubh-nair
Copy link
Member

@kaustubh-nair kaustubh-nair commented Feb 21, 2019 •
edited
Loading

Fixes #250
The problem was that the user attributes could not be accessed due to the select query. I explicitly selected the required user attribute and that seemed to have fixed it! 🎉

Here's a screenshot as well,
map

  • tests pass -- rake test
  • code has been rebased on top of latest master (check if another pull request was added recently, and please rebase)
  • pull request is descriptively named and, if possible, multiple commits squashed if they're smaller changes

Thanks!

jywarren
jywarren approved these changes Feb 21, 2019
View reviewed changes
Copy link
Member

@jywarren jywarren left a comment

Choose a reason for hiding this comment

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

Fantastic! Love the test too!

@jywarren jywarren merged commit f0e95cf into publiclab:main Feb 21, 2019
@welcome
Copy link

welcome bot commented Feb 21, 2019

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to https://mapknitter.org in the next few days.
In the meantime, can you tell us your Twitter handle so we can thank you properly?
Now that you've completed this, you can help someone else take their first step!
See: Public Lab's coding community!

jywarren added a commit to jywarren/mapknitter that referenced this pull request Apr 6, 2019
@jywarren
Rails4 (#188)
2e3be93 
* Contribute Dockerfile for working within a container

* Initial change made.

* .travis.yml

schema example

docker compose

more adjustmentes

new docker-compose

* slight adjustment to docker-compose.yml

* path fix

* bower.json

* bower.json openlayers

* bower.json openlayers tweak 2

* added rake

* Gemfile version tweak

* updated gemfile and Gemfile.lock

* bundle exec

* testing map map for only non-anonymous

* echoing gem list to debug

* rvm

* additional travis.yml tweaks

* Update .travis.yml

* Allow bundler to use system gems.

* Added mysql2 adapter dependency, tweaked database.yml and travis.yml

* Added mysql2 adapter, longer wait for db

* Update _list.html.erb

* Update _list.html.erb

* Update maps_controller.rb

* Update feeds_controller.rb

* Update Gemfile

* Update Gemfile

* Update .travis.yml

* Update database.yml.example

* recaptcha tweaks

* Update _list.html.erb

* Update routes.rb

* Update maps_controller.rb

* Update clean.builder

* Update clean.builder

* leaflet v1.0

* dockerfile fix

* updating to Leaflet 1.0, GoogleMutant tile layer, other tweaks

* js tweaks

* update gemfile recaptcha version

* Gemfile.lock

* unrelated tweaks

* Update Readme.md

Just a space for identifying syntax

* recaptcha fixes

* fixes

* Upgrade dependencies.

* updated paperclip

* issue publiclab#253 flag as spam

* integrate image-sequencer

* Update knitter2.html.erb

* Update bower.json

* Update show.html.erb

* Update show.html.erb

* Update show.html.erb

* Update bower.json

* modded button and prompt

* Update _list.html.erb

* API request handled for region-action

* more efficient spam redirect URL

* Update Map.js

* Update _login_form.html.erb

* Add files via upload

* Update README.md

* bower updated

* Map added

* Update index.html.erb

* Update _list.html.erb

* Update index.html.erb

* Update index.html.erb

* Changed width to full width .

* Added all layers from leaflet-environmental-layers

* Update bower.json

* Default Mapknitter Markers added

* Version updated for LEL .

* Full screen support added

* Update bower.json

* Create first timers issue template.md

* Create config.yml

* spam links in moderation feeds

* Add mapknitter to the help wanted link

Co-Authored-By: faithngetich <faithngetich188@gmail.com>

* Replace the community link with the code.public link

Co-Authored-By: faithngetich <faithngetich188@gmail.com>

* Update the first time only link to code.public

Co-Authored-By: faithngetich <faithngetich188@gmail.com>

* Use the correct link to indicate where the code will be published

Co-Authored-By: faithngetich <faithngetich188@gmail.com>

* Update index.html.erb

* Update bower.json

* Update bower.json

* Update bower.json

* Peg GoogleMutant layer to v0.7.0

see https://gitlab.com/IvanSanchez/Leaflet.GridLayer.GoogleMutant/issues/90 for the issue we encountered with `v0.7.1`

* [Security] Bump nokogiri from 1.8.1 to 1.9.1

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.1 to 1.9.1. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.8.1...v1.9.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Bump will_paginate from 3.0.7 to 3.1.6

Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.0.7 to 3.1.6.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](mislav/will_paginate@v3.0.7...v3.1.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Cleanup (publiclab#313)

* initial cleanup

* export unit tests, basic

* map tests

* basic comment tests

* cleanup

* export functional tests

* fixes

* Update export.rb

* test fixes and further cleanup

* extra test

* trying again

* another unit test

* output errors?

* Update map_test.rb

* Update maps.yml

* Update tag_test.rb

* Bump rake from 10.5.0 to 12.3.2 (publiclab#286)

Bumps [rake](https://github.com/ruby/rake) from 10.5.0 to 12.3.2.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](ruby/rake@v10.5.0...v12.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* [Security] Bump i18n from 0.7.0 to 0.9.5 (publiclab#289)

Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.**
- [Release notes](https://github.com/svenfuchs/i18n/releases)
- [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md)
- [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Bump rdiscount from 2.1.7.1 to 2.2.0.1 (publiclab#321)

Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1.
- [Release notes](https://github.com/davidfstr/rdiscount/releases)
- [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md)
- [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Unit test warpable code (publiclab#331)

* tests for warpables, test to distort in ImageMagick

* file existence test

* make test folder

* demo file and copying

* delete demo image

* mkdir -p

* save_dimensions

* Bump recaptcha from 4.6.3 to 4.9.0 (publiclab#332)

Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0.
- [Release notes](https://github.com/ambethia/recaptcha/releases)
- [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md)
- [Commits](ambethia/recaptcha@v4.6.3...v4.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Show only maps with at least one image in main listing

* Update Leaflet.DistortableImage version

* basic map unit tests (publiclab#334)

* basic map unit tests

* try to run entire map.run_export

* parameter consolidation

* Updates to customize rails / ruby and mySQL version compatibility  (publiclab#323)

* update time fixtures and override sql primary default keys

* Reset HEAD to first commit and reapply changes

* Finalize comments for customizations

* Changed a word

* update readme.md (publiclab#335)

solve the beginner issue of database

* Ruby upgrade to 2.4.4 (publiclab#320)

* ruby version update

* change in dockerfile

* version change to 2.4.4

* dockerfile fix

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* [Security] Bump i18n from 0.7.0 to 0.9.5 (publiclab#289)

Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.**
- [Release notes](https://github.com/svenfuchs/i18n/releases)
- [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md)
- [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Bump rdiscount from 2.1.7.1 to 2.2.0.1 (publiclab#321)

Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1.
- [Release notes](https://github.com/davidfstr/rdiscount/releases)
- [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md)
- [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Unit test warpable code (publiclab#331)

* tests for warpables, test to distort in ImageMagick

* file existence test

* make test folder

* demo file and copying

* delete demo image

* mkdir -p

* save_dimensions

* Bump recaptcha from 4.6.3 to 4.9.0 (publiclab#332)

Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0.
- [Release notes](https://github.com/ambethia/recaptcha/releases)
- [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md)
- [Commits](ambethia/recaptcha@v4.6.3...v4.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Show only maps with at least one image in main listing

* Update Leaflet.DistortableImage version

* basic map unit tests (publiclab#334)

* basic map unit tests

* try to run entire map.run_export

* parameter consolidation

* Updates to customize rails / ruby and mySQL version compatibility  (publiclab#323)

* update time fixtures and override sql primary default keys

* Reset HEAD to first commit and reapply changes

* Finalize comments for customizations

* Changed a word

* update readme.md (publiclab#335)

solve the beginner issue of database

* ruby version update

* change in dockerfile

* version change to 2.4.4

* dockerfile fix

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* gemfile.lock update

* gemfile.lock update

* Fix map of maps (publiclab#354)

* add image urls to maps json (publiclab#352)

* add image urls to maps json

* Add tests for image urls

* Shortening docker image in ~30%

* Caching bundle, gathering env variables and using newer sintax

* Creating startup script and env file

* Improving travis CI configuration

* Switch to Yarn from Bower

Ref: publiclab#357

Co-authored-by: kaunair <kaustubh.nair108@gmail.com>

* Loading assets in production env

* Allow uglifier to interpret ES6, removing yarn-error.log

* updating to rails4.2.8
chen-robert pushed a commit to chen-robert/mapknitter that referenced this pull request Dec 5, 2019
@kaustubh-nair @chen-robert
Fix map of maps (publiclab#354)
c3e8ea1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jywarren jywarren jywarren approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Map of maps page is broken
2 participants
@kaustubh-nair @jywarren