diff options
| author | ged-odoo <ged@odoo.com> | 2014-06-12 16:27:11 +0200 |
|---|---|---|
| committer | ged-odoo <ged@odoo.com> | 2014-06-12 16:27:11 +0200 |
| commit | 74168c4e9d1527cfdd62aae5e37ca3bfd4f584c3 (patch) | |
| tree | 6f11de511ecebc37aa539be6eb99ee8e7085e7ab /addons/gamification | |
| parent | 64b78b34d6427a4756dd652b21ab24c291a0110e (diff) | |
| parent | c73736694e7f99cbd5052de278c88c9efd160add (diff) | |
Merge pull request #272 from odoo-dev/master-inline-searchview-ged
[MERGP] Inline Searchview
This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place. It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)
Because of this, other large changes have been made:
the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)
It is likely that some stupid bugs have been introduced. Please don't hurt me.
Diffstat (limited to 'addons/gamification')
| -rw-r--r-- | addons/gamification/views/challenge.xml | 2 | ||||
| -rw-r--r-- | addons/gamification/views/goal.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml index d76fdc29a52..8a962c15d54 100644 --- a/addons/gamification/views/challenge.xml +++ b/addons/gamification/views/challenge.xml @@ -223,7 +223,7 @@ <filter name="hr_challenges" string="HR Challenges" domain="[('category', '=', 'hr')]"/> <field name="name"/> - <group expand="0" string="Group By..."> + <group expand="0" string="Group By"> <filter string="State" domain="[]" context="{'group_by':'state'}"/> <filter string="Period" domain="[]" context="{'group_by':'period'}"/> </group> diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml index 4e1bf598f78..32382f179b7 100644 --- a/addons/gamification/views/goal.xml +++ b/addons/gamification/views/goal.xml @@ -110,7 +110,7 @@ <field name="user_id"/> <field name="definition_id"/> <field name="challenge_id"/> - <group expand="0" string="Group By..."> + <group expand="0" string="Group By"> <filter name="group_by_user" string="User" domain="[]" context="{'group_by':'user_id'}"/> <filter name="group_by_definition" string="Goal Definition" domain="[]" context="{'group_by':'definition_id'}"/> <filter string="State" domain="[]" context="{'group_by':'state'}"/> @@ -274,7 +274,7 @@ <field name="name"/> <field name="model_id"/> <field name="field_id"/> - <group expand="0" string="Group By..."> + <group expand="0" string="Group By"> <filter string="Model" domain="[]" context="{'group_by':'model_id'}"/> <filter string="Computation Mode" domain="[]" context="{'group_by':'computation_mode'}"/> </group> |