This repository was archived by the owner on Apr 21, 2020. It is now read-only.
* Bugfix and cleanup in "display unread topics/post"#19
Open
jedie wants to merge 138 commits intoslav0nic:masterfrom
Open
* Bugfix and cleanup in "display unread topics/post"#19jedie wants to merge 138 commits intoslav0nic:masterfrom
jedie wants to merge 138 commits intoslav0nic:masterfrom
Conversation
Contributor
jedie
commented
Sep 28, 2012
jedie
commented
- Add some docstrings
- TODO: Change the PostTracking.topics field type!
--HG-- rename : djangobb_forum/templates/forum/add_post.html => djangobb_forum/templates/djangobb_forum/add_post.html rename : djangobb_forum/templates/forum/base.html => djangobb_forum/templates/djangobb_forum/base.html rename : djangobb_forum/templates/forum/delete_posts.html => djangobb_forum/templates/djangobb_forum/delete_posts.html rename : djangobb_forum/templates/forum/edit_post.html => djangobb_forum/templates/djangobb_forum/edit_post.html rename : djangobb_forum/templates/forum/feeds/posts_description.html => djangobb_forum/templates/djangobb_forum/feeds/posts_description.html rename : djangobb_forum/templates/forum/feeds/posts_title.html => djangobb_forum/templates/djangobb_forum/feeds/posts_title.html rename : djangobb_forum/templates/forum/feeds/topics_description.html => djangobb_forum/templates/djangobb_forum/feeds/topics_description.html rename : djangobb_forum/templates/forum/feeds/topics_title.html => djangobb_forum/templates/djangobb_forum/feeds/topics_title.html rename : djangobb_forum/templates/forum/forum.html => djangobb_forum/templates/djangobb_forum/forum.html rename : djangobb_forum/templates/forum/forum_row.html => djangobb_forum/templates/djangobb_forum/forum_row.html rename : djangobb_forum/templates/forum/header.html => djangobb_forum/templates/djangobb_forum/header.html rename : djangobb_forum/templates/forum/index.html => djangobb_forum/templates/djangobb_forum/index.html rename : djangobb_forum/templates/forum/lofi/base.html => djangobb_forum/templates/djangobb_forum/lofi/base.html rename : djangobb_forum/templates/forum/lofi/footer.html => djangobb_forum/templates/djangobb_forum/lofi/footer.html rename : djangobb_forum/templates/forum/lofi/forum.html => djangobb_forum/templates/djangobb_forum/lofi/forum.html rename : djangobb_forum/templates/forum/lofi/header.html => djangobb_forum/templates/djangobb_forum/lofi/header.html rename : djangobb_forum/templates/forum/lofi/index.html => djangobb_forum/templates/djangobb_forum/lofi/index.html rename : djangobb_forum/templates/forum/lofi/pagination.html => djangobb_forum/templates/djangobb_forum/lofi/pagination.html rename : djangobb_forum/templates/forum/lofi/topic.html => djangobb_forum/templates/djangobb_forum/lofi/topic.html rename : djangobb_forum/templates/forum/mail_to.html => djangobb_forum/templates/djangobb_forum/mail_to.html rename : djangobb_forum/templates/forum/moderate.html => djangobb_forum/templates/djangobb_forum/moderate.html rename : djangobb_forum/templates/forum/moderators.html => djangobb_forum/templates/djangobb_forum/moderators.html rename : djangobb_forum/templates/forum/move_topic.html => djangobb_forum/templates/djangobb_forum/move_topic.html rename : djangobb_forum/templates/forum/pagination.html => djangobb_forum/templates/djangobb_forum/pagination.html rename : djangobb_forum/templates/forum/post_preview.html => djangobb_forum/templates/djangobb_forum/post_preview.html rename : djangobb_forum/templates/forum/profile/profile_admin.html => djangobb_forum/templates/djangobb_forum/profile/profile_admin.html rename : djangobb_forum/templates/forum/profile/profile_display.html => djangobb_forum/templates/djangobb_forum/profile/profile_display.html rename : djangobb_forum/templates/forum/profile/profile_essentials.html => djangobb_forum/templates/djangobb_forum/profile/profile_essentials.html rename : djangobb_forum/templates/forum/profile/profile_menu.html => djangobb_forum/templates/djangobb_forum/profile/profile_menu.html rename : djangobb_forum/templates/forum/profile/profile_messaging.html => djangobb_forum/templates/djangobb_forum/profile/profile_messaging.html rename : djangobb_forum/templates/forum/profile/profile_personal.html => djangobb_forum/templates/djangobb_forum/profile/profile_personal.html rename : djangobb_forum/templates/forum/profile/profile_personality.html => djangobb_forum/templates/djangobb_forum/profile/profile_personality.html rename : djangobb_forum/templates/forum/profile/profile_privacy.html => djangobb_forum/templates/djangobb_forum/profile/profile_privacy.html rename : djangobb_forum/templates/forum/report.html => djangobb_forum/templates/djangobb_forum/report.html rename : djangobb_forum/templates/forum/reputation.html => djangobb_forum/templates/djangobb_forum/reputation.html rename : djangobb_forum/templates/forum/reputation_form.html => djangobb_forum/templates/djangobb_forum/reputation_form.html rename : djangobb_forum/templates/forum/search_form.html => djangobb_forum/templates/djangobb_forum/search_form.html rename : djangobb_forum/templates/forum/search_posts.html => djangobb_forum/templates/djangobb_forum/search_posts.html rename : djangobb_forum/templates/forum/search_topics.html => djangobb_forum/templates/djangobb_forum/search_topics.html rename : djangobb_forum/templates/forum/topic.html => djangobb_forum/templates/djangobb_forum/topic.html rename : djangobb_forum/templates/forum/upload_avatar.html => djangobb_forum/templates/djangobb_forum/upload_avatar.html rename : djangobb_forum/templates/forum/user.html => djangobb_forum/templates/djangobb_forum/user.html rename : djangobb_forum/templates/forum/users.html => djangobb_forum/templates/djangobb_forum/users.html
…"meta" lines --- djangobb_forum/static/djangobb_forum/js/markup/bbcode/board.js | 4 ++-- djangobb_forum/templates/djangobb_forum/topic.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
--- djangobb_forum/forms.py | 7 +- .../0004_auto__add_field_profile_auto_subscribe.py | 180 ++++++++++++++++++++ djangobb_forum/models.py | 1 + .../templates/djangobb_forum/add_post.html | 35 +--- .../djangobb_forum/includes/post_form.html | 38 +++++ .../djangobb_forum/profile/profile_essentials.html | 10 +- djangobb_forum/templates/djangobb_forum/topic.html | 32 +--- djangobb_forum/views.py | 10 +- 8 files changed, 244 insertions(+), 69 deletions(-) create mode 100644 djangobb_forum/migrations/0004_auto__add_field_profile_auto_subscribe.py create mode 100644 djangobb_forum/templates/djangobb_forum/includes/post_form.html
…n GET -> use request.user * remove {% if results %} with {% for %}...{% empty %} * Refactor search()
Fixed topic search results which returned nothing.
Return a list instead of a generator in TopicFromPostResult.__getitem__() so that the pagination can work correctly.
from: https://bitbucket.org/hsoft/djangobb/changeset/1b2f31c54c516c699a7b11a1d43b170742157df5
use the slow, but correct solution for display the result as topics
used fast solution with a work-a-round for double topics
respect sort order
count only one time
better solution, but slow with woosh and many hits
change info
make it DRY
remove debug imports
remove not needed tuple()
* add "show your topics/posts" search
* add link to switch between topics/posts search
* merge {% block controls %}
* make search_posts.html useable with queryset and SearchQuerySet
Add topic <-> post switch links to other type of search, too.
not really in GET needed.
* Use PostSearchForm() in normal search
* add switch links to normal search, too.
better docstring
better text?
…roll down * bugfix for logging (IE)
…port.djangobb.org/topic/333/ (This is a combination of 9 commits.)
---
--- djangobb_forum/views.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
…nly staff members to change the user ID via URL. * Add message, if user_id changed by GET parameter ---
…uerysets in all search types * don't filter by category groups for superusers * display hit count as success message ---
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
* Add some docstrings * TODO: Change the PostTracking.topics field type: http://support.djangobb.org/topic/355/
slav0nic
added a commit
that referenced
this pull request
Jul 30, 2013
Fixed #176: IPv6 causes warning "Data truncated for column 'user_ip' at row 1"
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.