Skip to content

12.0 mig web m2x options #1086

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

Merged
merged 23 commits into from
Feb 21, 2019
Merged

12.0 mig web m2x options #1086

merged 23 commits into from
Feb 21, 2019

Conversation

gustitammam
Copy link
Contributor

No description provided.

@oca-clabot
Copy link

Hey @gustitammam, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/cla
Here is a list of the users:

Appreciation of efforts,
OCA CLAbot

@pedrobaeza pedrobaeza added this to the 12.0 milestone Oct 19, 2018
@OCA-git-bot OCA-git-bot mentioned this pull request Oct 19, 2018
40 tasks
@pedrobaeza
Copy link
Member

Please add #1118 to this PR

Copy link
Member

@nikul-serpentcs nikul-serpentcs left a comment

Choose a reason for hiding this comment

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

Improve Code

@@ -0,0 +1,23 @@

Copy link
Member

Choose a reason for hiding this comment

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

@gustitammam IMO Add copyright

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@gustitammam IMO Add copyright

@nikul-serpentcs here: 85a462d

@gustitammam
Copy link
Contributor Author

Please add #1118 to this PR

@pedrobaeza This is it: 12c88b0

@pedrobaeza
Copy link
Member

@gustitammam please don't do merge operations over the branch, as this scrambles the commit history and provoke conflicts for next versions. Please rebase now over 12.0 branch for fixing commit history.

@gustitammam
Copy link
Contributor Author

@gustitammam please don't do merge operations over the branch, as this scrambles the commit history and provoke conflicts for next versions. Please rebase now over 12.0 branch for fixing commit history.

I just rebase it, @pedrobaeza please review, is this correct?

@pedrobaeza
Copy link
Member

There's a new change in 11.0: ddbbe81

@pedrobaeza
Copy link
Member

@gustitammam the rest seems OK. Thanks for the efforts.

@gustitammam
Copy link
Contributor Author

There's a new change in 11.0: ddbbe81

Here is it: 877bc32

@pedrobaeza
Copy link
Member

@gustitammam how are you handling additions? there are duplicated commits now. For example, I see 3 commits for "[MIG] web_m2x_options: Migration to 11.0", which should be only one.

@gustitammam
Copy link
Contributor Author

@gustitammam how are you handling additions? there are duplicated commits now. For example, I see 3 commits for "[MIG] web_m2x_options: Migration to 11.0", which should be only one.

I'm doing this: git format-patch --keep-subject --stdout origin/12.0..origin/11.0 -- $MODULE | git am -3 --keep
Actually I also not sure about this way. How should I handle the change ?

@pedrobaeza
Copy link
Member

But each time you include a commit? That's why there are duplicated commits.

You should only cherry-pick the needed commit. Please clean the PR removing the duplicated commits and being sure no valid code is removed.

@gustitammam
Copy link
Contributor Author

But each time you include a commit? That's why there are duplicated commits.

You should only cherry-pick the needed commit. Please clean the PR removing the duplicated commits and being sure no valid code is removed.

Please check, I was removing the duplicated commits with this steps:

@pedrobaeza
Copy link
Member

Great, thanks. Now it looks correct.

@ernestotejeda please review this one.

Copy link
Member

@ernestotejeda ernestotejeda left a comment

Choose a reason for hiding this comment

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

if the option 'open' is set in true, when clicking on an element A, the associated resource will be opened in a dialog, but the color palette in the background is also shown. After closing the dialog, each time you click A, othe color palette is shown and not the dialog, unless you select another color for element A.
wrong_web_m2x_options

Copy link
Member

@ernestotejeda ernestotejeda left a comment

Choose a reason for hiding this comment

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

The no_color_picker option doesn't seem to work

Copy link
Member

@ernestotejeda ernestotejeda left a comment

Choose a reason for hiding this comment

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

Generate README.rst file, please

@bealdav
Copy link
Member

bealdav commented Feb 11, 2019

No news here ? Thanks

@jcdrubay
Copy link

I tested for a few days and it worked well. nice :)

Copy link

@jcdrubay jcdrubay left a comment

Choose a reason for hiding this comment

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

I tested for few days and it worked nicely.

@pedrobaeza
Copy link
Member

@gustitammam can you check pending comment?

@gustitammam
Copy link
Contributor Author

if the option 'open' is set in true, when clicking on an element A, the associated resource will be opened in a dialog, but the color palette in the background is also shown. After closing the dialog, each time you click A, othe color palette is shown and not the dialog, unless you select another color for element A.
wrong_web_m2x_options

Honestly I never know about web_m2x_options.open option is exist, I used to use this options: web_m2x_options.create, web_m2x_options.create_edit, web_m2x_options.m2o_dialog.

@ernestotejeda I'm trying to reproduce your step, I set web_m2x_options.open to True but nothing happen when I click on many2many_tags. How can a popup show up in yours ?

@pedrobaeza Maybe I need some helps about this issue. It's quite difficult for me.

@pedrobaeza
Copy link
Member

@ernestotejeda please assist in this to @gustitammam

@rven
Copy link
Contributor

rven commented Feb 18, 2019

@gustitammam could you please do a git rebase origin/12.0 on this PR?

@ernestotejeda
Copy link
Member

So, here are the steps

peek 18-02-2019 10-29

@bealdav
Copy link
Member

bealdav commented Feb 19, 2019

Mergeable ?

@gustitammam
Copy link
Contributor Author

@ernestotejeda Thank you for the clue, open and no_color_picker is fixed now in 396e4f5, also I generate the README.rst in a6e51e3

@rven done, it's rebased.

@rven
Copy link
Contributor

rven commented Feb 19, 2019

@gustitammam I think the rebase is not done correctly
first you have to fetch the changes of the origin and then you have to rebase these remote changes into your branch.
I'm getting conflicts on the latest 12.0 branch when applying your PR.

Merge pull request #1187 from Tardo/pr_imp_sticky

git remote -v
origin https://github.com/OCA/web.git (fetch)
origin https://github.com/OCA/web.git (push)

git fetch origin # Updates origin/12.0
git rebase origin/12.0 # Rebases current branch onto origin/12.0

then force push these changes.

Before you rebase you also have to fetch the remote branch for changes.

Nicolas JEUDY and others added 17 commits February 19, 2019 21:28
- Add static/description/index.html

fix: use include instead of extend in js function inheritance.

fix: not overwriting the existing object references with the result of the include

fix: update name according to new module name.

fix: error when displaying many2many field without options defined.
[ADD] support 'no_open_edit' on many2one
[FIX] typos
…and make the module installable [MIG] adapt form.js to the new API. [FIX] Fix bug mentioned in pull #262. [MIG] Make the module installable.
…th `options={'open': True}` it always open the first element with this fix it will open the right one
* [FIX][web_m2x_options] Fix Qweb templates.

They were trying to replace non-existing elements, and this was being logged to console:

    Can't find "a.oe_m2o_cm_button" when extending template FieldMany2One
    Can't find "span.badge" when extending template FieldMany2ManyTag

* Raise version correctly.

* [FIX] Make many2many_tags tag deletion work again

* Correct replacement of event

Instead of overwriting all events from upstream widget, better just overwrite the one you need and inherit the rest.
* fix unecessary calls

Do check_access_rights and disable_quick_create calls only once per field.
`web_m2x_options` is supposed to render fields in the context of a form or tree view, where domains can safely be applied because there's a main record that includes a context.

However, when installing along with `web_advanced_search_x2x`, they produce an incompatibility when a x2x field's domain is defined and depends on the current record's context, because a search view has no notion of a *current record*.

The fix is simple: try to do as usual, and if it fails, try without the field's domain.

Without this patch, an exception like this would be raised, i.e. when both addons are installed and you are trying to search project tasks by stage:

``` Error: NameError: name 'project_id' is not defined
http://localhost/web/static/lib/py.js/lib/py.js:370# Traceback:# Changes to be committed:
PY_ensurepy@http://localhost/web/static/lib/py.js/lib/py.js:370:19# modified: static/src/js/form.js
py.evaluate@http://localhost/web/static/lib/py.js/lib/py.js:1340:20#
py.evaluate@http://localhost/web/static/lib/py.js/lib/py.js:1397:35
py.evaluate@http://localhost/web/static/lib/py.js/lib/py.js:1409:34
py.eval@http://localhost/web/static/lib/py.js/lib/py.js:1453:16
eval_domains/<@http://localhost/web/static/src/js/framework/pyeval.js:869:39
_.forEach@http://localhost/web/static/lib/underscore/underscore.js:145:9
_.mixin/</_.prototype[name]@http://localhost/web/static/lib/underscore/underscore.js:1484:29
eval_domains@http://localhost/web/static/src/js/framework/pyeval.js:860:5
eval_domains/<@http://localhost/web/static/src/js/framework/pyeval.js:873:39
_.forEach@http://localhost/web/static/lib/underscore/underscore.js:145:9
_.mixin/</_.prototype[name]@http://localhost/web/static/lib/underscore/underscore.js:1484:29
eval_domains@http://localhost/web/static/src/js/framework/pyeval.js:860:5
eval_domains/<@http://localhost/web/static/src/js/framework/pyeval.js:873:39
_.forEach@http://localhost/web/static/lib/underscore/underscore.js:145:9
_.mixin/</_.prototype[name]@http://localhost/web/static/lib/underscore/underscore.js:1484:29
eval_domains@http://localhost/web/static/src/js/framework/pyeval.js:860:5
pyeval@http://localhost/web/static/src/js/framework/pyeval.js:977:16
eval_arg@http://localhost/web/static/src/js/framework/pyeval.js:988:16
ensure_evaluated@http://localhost/web/static/src/js/framework/pyeval.js:1011:21
call@http://localhost/web/static/src/js/framework/data_model.js:56:9
name_search@http://localhost/web/static/src/js/framework/data.js:537:16
get_search_result@http://localhost/web_m2x_options/static/src/js/form.js:130:50
OdooClass.extend/Class.include/</prototype[name]</<@http://localhost/web/static/src/js/framework/class.js:122:35
source@http://localhost/web/static/src/js/views/form_relational_widgets.js:271:17
_search@http://localhost/web/static/lib/jquery.ui/jquery-ui.js:6823:3
$.widget/</proxiedPrototype[prop]</<@http://localhost/web/static/lib/jquery.ui/jquery-ui.js:415:19
search@http://localhost/web/static/lib/jquery.ui/jquery-ui.js:6815:10
$.widget/</proxiedPrototype[prop]</<@http://localhost/web/static/lib/jquery.ui/jquery-ui.js:415:19
$.widget.bridge/$.fn[name]/<@http://localhost/web/static/lib/jquery.ui/jquery-ui.js:508:19
each@http://localhost/web/static/lib/jquery/jquery.js:383:49
each@http://localhost/web/static/lib/jquery/jquery.js:136:24
$.widget.bridge/$.fn[name]@http://localhost/web/static/lib/jquery.ui/jquery-ui.js:494:4
render_editable/<@http://localhost/web/static/src/js/views/form_relational_widgets.js:189:21
dispatch@http://localhost/web/static/lib/jquery/jquery.js:4640:50
add/elemData.handle@http://localhost/web/static/lib/jquery/jquery.js:4309:41
```
@gustitammam
Copy link
Contributor Author

@rven please try again.

Copy link
Member

@ernestotejeda ernestotejeda left a comment

Choose a reason for hiding this comment

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

It's working great

ernestotejeda and others added 6 commits February 21, 2019 01:08
web_m2x_options: Fix usage for non-admins

web_m2x_options: Reduce rpc calls

web_m2x_options: Update manifest and readme
Currently translated at 91.7% (11 of 12 strings)

Translation: web-11.0/web-11.0-web_m2x_options
Translate-URL: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_m2x_options/pt_BR/
The method `_onOpenColorPicker` is defined on `FormFieldMany2ManyTags`, not in `FieldMany2ManyTags`, so it can only be called on its descendants.

Otherwise, clicking on a `many2many_tags` tag when found in a tree view produces an error such as:

    TypeError: self._onOpenColorPicker is not a function

    http://localhost/web_m2x_options/static/src/js/form.js:354
    Rastreo de error:
    _onOpenBadge@http://localhost/web_m2x_options/static/src/js/form.js:354:17
    proxy/<@http://localhost/web/static/src/js/core/mixins.js:279:20
    dispatch@http://localhost/web/static/lib/jquery/jquery.js:4640:50
    add/elemData.handle@http://localhost/web/static/lib/jquery/jquery.js:4309:41

(cherry picked from commit ddbbe81)
@pedrobaeza pedrobaeza merged commit 2296c72 into OCA:12.0 Feb 21, 2019
@pedrobaeza
Copy link
Member

Thanks for the contribution

@gustitammam gustitammam deleted the 12.0-mig-web_m2x_options branch February 21, 2019 01:51
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.