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

9.0 selection filter #110

Merged
merged 13 commits into from Oct 5, 2016
Merged

9.0 selection filter #110

merged 13 commits into from Oct 5, 2016

Conversation

yvaucher
Copy link
Member

@yvaucher yvaucher commented Oct 4, 2016

This is a port of the selection filter made for geoengine in odoo 8.0 on odoo 9.0 with OL3

  • First commits are cherry-picked from [8.0] Map selection #105
  • Instead of having a button in tool box, dragbox is usable by pressing the SHIFT key.
  • It supports multi vector layer selection.

@pedrobaeza
Copy link
Member

Can you squash a bit the commits?

@@ -524,6 +573,18 @@ var GeoengineView = View.extend(geoengine_common.GeoengineMixin, {
});
var layerSwitcher = new ol.control.LayerSwitcher({});
map.addControl(layerSwitcher);
/*
Copy link
Member

Choose a reason for hiding this comment

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

Remove commented code

@yvaucher
Copy link
Member Author

yvaucher commented Oct 4, 2016

@pedrobaeza Still work in progress and no I can't squash commits, most of the commits are cherry-pick from #105

@yvaucher
Copy link
Member Author

yvaucher commented Oct 4, 2016

@pedrobaeza BTW target branch is 9.0-ol3

@pedrobaeza
Copy link
Member

Yeah, I see, it would be good at the end of the process then

@yvaucher
Copy link
Member Author

yvaucher commented Oct 4, 2016

@pedrobaeza still I wanted to keep track of commits done in 8.0 inside 9.0 to show that we are not missing those commits. Here you have few copied commits plus few new commits to port it.

@pedrobaeza
Copy link
Member

OK, it's not a heavy requirement, but you can see that a not-squashing operation in 8.0 makes now to appear a lot of useless commits. Let's try to make it better in the new 9.0 commits!!

@yvaucher yvaucher merged commit acc7209 into OCA:9.0-ol3 Oct 5, 2016
@yvaucher yvaucher deleted the 9.0-selection branch October 5, 2016 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants