Merge lp://qastaging/~openerp-commiter/openobject-client/client-image-widget into lp://qastaging/openobject-client
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~openerp-commiter/openobject-client/client-image-widget |
Merge into: | lp://qastaging/openobject-client |
Diff against target: |
723 lines (+583/-8) (has conflicts) 8 files modified
bin/widget/model/field.py (+1/-0) bin/widget/view/common_gtk.py (+193/-0) bin/widget/view/form_gtk/image.py (+18/-2) bin/widget/view/form_gtk/many2one_image.py (+202/-0) bin/widget/view/form_gtk/parser.py (+5/-5) bin/widget/view/tree_gtk/image.py (+64/-0) bin/widget/view/tree_gtk/many2one_image.py (+81/-0) bin/widget/view/tree_gtk/parser.py (+19/-1) Text conflict in bin/widget/view/form_gtk/image.py Text conflict in bin/widget/view/tree_gtk/parser.py |
To merge this branch: | bzr merge lp://qastaging/~openerp-commiter/openobject-client/client-image-widget |
Related bugs: | |
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christophe Simonis (OpenERP) | Needs Fixing | ||
Stephane Wirtel (OpenERP) | Pending | ||
Review via email:
|
Description of the change
* Add image widget for Tree.image (and so for Form.M2M too), Tree.M2O_image, Form.M2O_image
* Add more image format support.
Pictures of those new widgets in action:
* http://
* http://
* http://
See branch description for more details.
Unmerged revisions
- 1219. By Nicolas DS
-
[IMP] form.M2O_image code clean up
- 1218. By Nicolas DS
-
[IMP] Added clear button for the form.M2O_image widget
- 1217. By Nicolas DS
-
[REF] Form.M2O_image widget
- 1216. By Nicolas DS
-
[FIX] image-widget: Typos + Making code more robust
- 1215. By Nicolas DS
-
[IMP] get_pixbuf and get_thumbnail support multi id query
- 1214. By Nicolas DS
-
[MERGE] from official trunk GTK client
- 1213. By Nicolas DS
-
[FIX] Bug due to model field change
- 1212. By Nicolas DS
-
[FIX] M2O image find and get
- 1211. By Nicolas DS
-
[FIX] Case when M2O relation is empty
- 1210. By Nicolas DS
-
[MERGE] From trunk
I don't get it. I don't see why you need to define a new widget ? Is keeping widget="image" not enough, and just handle the case where this is display in tree view? Beeing displayed into a x2many [1] is not a special case.
[1] this is a one2many, not a many2one. And only for this error, the merge is in "Needs Fixing"