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

Show number of annotations instead of nbAnnotations placeholder #2406

Merged
merged 1 commit into from Oct 9, 2016

Conversation

szafranek
Copy link
Contributor

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? n/a
Documentation no
Translation yes
Fixed tickets n/a
License MIT

When there was more than one annotation, the %nbAnnotations% placeholder was displayed in both themes, instead of actual number.

When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number.
@@ -54,7 +54,6 @@
{% endif %}
</i>

{% set nbAnnotations = entry.annotations | length %}
Copy link
Member

Choose a reason for hiding this comment

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

Could you also remove that line in the material theme?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That line was never added to the Material theme in a first place.

Copy link
Member

Choose a reason for hiding this comment

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

Oups yeah sorry :)

Copy link
Member

Choose a reason for hiding this comment

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

I guess that's the origin of the issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tested both themes and this line was not helping in the baggy theme either – both themes showed a placeholder instead of the number of annotations.

Copy link
Member

Choose a reason for hiding this comment

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

Oh. Well, good catch then.

@j0k3r j0k3r added this to the 2.1.2 milestone Oct 9, 2016
@j0k3r j0k3r added the Bug label Oct 9, 2016
Copy link
Member

@j0k3r j0k3r left a comment

Choose a reason for hiding this comment

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

Thanks for that 👍

@j0k3r j0k3r merged commit e39aec3 into wallabag:master Oct 9, 2016
@szafranek szafranek deleted the bugfix-number-of-annotations branch October 9, 2016 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants