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

fix: display 'and x others...' on tooltip (DHIS2-8753) v33 backport #927

Merged
merged 8 commits into from
May 4, 2020

Conversation

martinkrulltott
Copy link
Contributor

DHIS2-8753 fix for v33. Backported #925 by manually copy-pasting the fix from adaa485 and generating a new pot file. A clean cherry-pick wasn't possible since v33 didn't implement the renderItems method. Please see the original PR for details.

@martinkrulltott
Copy link
Contributor Author

Note: this hasn't been tested locally since I don't have a local v33 Docker instance and using the https://play.dhis2.org/2.33.3/ as backend doesn't work (just get a 401). So should ideally be tested locally before merging.

@martinkrulltott
Copy link
Contributor Author

v32 follows the same pattern as v33 so this could probably be cherry-picked to v32 as well in a separate PR.

Copy link
Member

@edoardo edoardo left a comment

Choose a reason for hiding this comment

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

LGTM.
Tested locally.

@martinkrulltott martinkrulltott merged commit dd62dbb into v33 May 4, 2020
@martinkrulltott martinkrulltott deleted the fix/DHIS2-8753-v33-backport branch May 4, 2020 07:21
martinkrulltott added a commit that referenced this pull request May 20, 2020
…945)

DHIS2-8753 fix for v32. Backported #927 by cherry-picking dd62dbb and generating a new pot file. Please see the original PR for details (#925)
dhis2-bot added a commit that referenced this pull request Jun 8, 2020
# [32.1.0](v32.0.3...v32.1.0) (2020-06-08)

### Bug Fixes

* upgrade d2-ui dependencies for latest translations [v32] [DHIS2-8892] ([#1061](#1061)) ([6bc2f8c](6bc2f8c))
* **translations:** sync translations from transifex (v32) ([ff4839e](ff4839e))
* **translations:** sync translations from transifex (v32) ([bb026d0](bb026d0))
* **translations:** sync translations from transifex (v32) ([c15e3b6](c15e3b6))
* **translations:** sync translations from transifex (v32) ([0620c69](0620c69))
* @dhis2/analytics@2.4.9 ([4ed10df](4ed10df))
* allow : after bold and italic ([#314](#314)) ([59aed20](59aed20))
* changed height to min-height for the axes area ([#361](#361)) ([#366](#366)) ([5848460](5848460))
* d2-charts-api@32.0.9 ([27eff19](27eff19))
* deep check styles for changes ([#283](#283)) ([e76555c](e76555c))
* display 'and x others...' on tooltip (DHIS2-8753) v32 backport ([#945](#945)) ([0590fdf](0590fdf)), closes [#927](#927) [#925](#925)
* epi curve bug (v32) ([#529](#529)) ([2908206](2908206))
* epi curve bug v32 (v2) ([#530](#530)) ([de40d3d](de40d3d))
* Fetching analytics for analytical object with undefined aggregationType in plugin ([#232](#232)) ([bfe41b4](bfe41b4))
* Fetching analytics for year over year charts in plugin ([#231](#231)) ([16853ef](16853ef))
* manifest credentials bug in chrome ([#233](#233)) ([a0032e0](a0032e0))
* merge conflict ([#545](#545)) ([8e5f7aa](8e5f7aa))
* pie tooltip v32 ([#332](#332)) ([77b2628](77b2628))
* plugin - add deep checks to determine whether to redraw chart  ([#284](#284)) ([4b8837e](4b8837e))
* remove api.baseUrl duplicate ([#571](#571)) ([fafd58e](fafd58e))
* v32 backport, upgraded to Analytics v2.4.7 to support long dimension names (DHIS2-7932) ([#622](#622)) ([2cd524a](2cd524a))
* working translations [v32] ([#1001](#1001)) ([c32c623](c32c623))

### Features

* dual axis support ([#239](#239)) ([a50075c](a50075c))
* multiple org units support ([#333](#333)) ([6392efa](6392efa))

### Reverts

* Revert "fix: use lerna to share code instead of copying resources (#214)" (#216) ([de00b4f](de00b4f)), closes [#214](#214) [#216](#216)
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 33.1.13 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

4 participants