FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Adding a group topic message_list view and fixing documentation. · dynamicguy/django-basic-apps@ae7eb21 · GitHub

  1. dynamicguy
  2. django-basic-apps

Repository navigation

Commit ae7eb21

Browse files
nathanborror
committed
Adding a group topic message_list view and fixing documentation.
1 parent 9f36e55 commit ae7eb21

5 files changed

Lines changed: 65 additions & 23 deletions

File tree

‎basic/groups/templates/groups/messages/message_list.html‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{% extends "groups/base_groups.html" %}
2+
3+
4+
{% block title %}Messages for "{{ topic }}"{% endblock %}
5+
{% block body_class %}{{ block.super }} messages message_list{% endblock %}
6+
7+
8+
{% block content_title %}
9+
<h2>Messages for "{{ topic }}"</h2>
10+
{% endblock %}
11+
12+
13+
{% block content %}
14+
{% if message_list %}
15+
<div class="list">
16+
{% for message in message_list %}
17+
<div class="item">
18+
{{ message.message|markdown }}
19+
<p class="datetime">Posted by <a href="{{ message.user.get_absolute_url }}">{{ message.user.username }}</a> on {{ message.created|date }}</p>
20+
</div>
21+
{% endfor %}
22+
</div>
23+
{% endif %}
24+
25+
<form action="{% url groups:message_create group.slug, topic.id %}?next={{ request.path }}" method="post">{% csrf_token %}
26+
<p>{{ message_form.message }}</p>
27+
<p class="submit">
28+
<button type="submit" name="post" value="Post">Post</button>
29+
</p>
30+
</form>
31+
{% endblock %}

‎basic/groups/urls.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
url(r'^%s$' % TOPIC_URL, 'topic_detail', name='topic'),
2525
url(r'^%sedit/$' % TOPIC_URL, 'topic_edit', name='topic_edit'),
2626
url(r'^%sremove/$' % TOPIC_URL, 'topic_remove', name='topic_remove'),
27-
url(r'^%smoderate/$' % TOPIC_URL, 'topic_moderate', name='topic_moderate'),
2827
url(r'^%stopics/$' % GROUP_URL, 'topic_list', name='topics'),
2928
)
3029

@@ -42,5 +41,5 @@
4241
url(r'^%s$' % MESSAGE_URL, 'message_detail', name='message'),
4342
url(r'^%sedit/$' % MESSAGE_URL, 'message_edit', name='message_edit'),
4443
url(r'^%sremove/$' % MESSAGE_URL, 'message_remove', name='message_remove'),
45-
url(r'^%soderate/$' % MESSAGE_URL, 'message_moderate', name='message_moderate'),
44+
url(r'^%smessages/$' % TOPIC_URL, 'message_list', name='messages'),
4645
)

‎basic/groups/views/messages.py‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,34 @@
66
from basic.tools.shortcuts import render, redirect
77

88

9+
def message_list(request, slug, topic_id, template_name='groups/messages/message_list.html'):
10+
"""
11+
Returns a group topic message list page.
12+
13+
Templates: ``groups/messages/message_list.html``
14+
Context:
15+
group
16+
Group object
17+
topic
18+
GroupTopic object
19+
message_list
20+
List of GroupMessage objects
21+
"""
22+
group = get_object_or_404(Group, slug=slug, is_active=True)
23+
topic = get_object_or_404(GroupTopic, pk=topic_id, group=group, is_active=True)
24+
return render(request, template_name, {
25+
'group': group,
26+
'topic': topic,
27+
'message_list': topic.messages.all()
28+
})
29+
30+
931
def message_detail(request, slug, topic_id, message_id,
1032
template_name='groups/messages/message_detail.html'):
1133
"""
1234
Returns a message detail page.
1335
14-
Templates: ``groups/message_detail.html``
36+
Templates: ``groups/messages/message_detail.html``
1537
Context:
1638
group
1739
Group object
@@ -36,7 +58,7 @@ def message_create(request, slug, topic_id,
3658
"""
3759
Returns a group message form.
3860
39-
Templates: ``groups/message_form.html``
61+
Templates: ``groups/messages/message_form.html``
4062
Context:
4163
group
4264
Group object
@@ -70,7 +92,7 @@ def message_edit(request, slug, topic_id, message_id,
7092
"""
7193
Returns a group message edit form.
7294
73-
Templates: ``groups/message_form.html``
95+
Templates: ``groups/messages/message_form.html``
7496
Context:
7597
group
7698
Group object
@@ -103,7 +125,7 @@ def message_remove(request, slug, topic_id, message_id,
103125
"""
104126
Returns a message delete confirmation page.
105127
106-
Templates: ``groups/message_remove_confirm.html``
128+
Templates: ``groups/messages/message_remove_confirm.html``
107129
Context:
108130
group
109131
Group object
@@ -122,8 +144,3 @@ def message_remove(request, slug, topic_id, message_id,
122144
'topic': message.topic,
123145
'message': message,
124146
})
125-
126-
127-
def message_moderate(request, slug, topic_id, message_id,
128-
template_name='groups/messages/message_moderate_confirm.html'):
129-
pass

‎basic/groups/views/pages.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def page_detail(request, slug, page_slug,
1111
"""
1212
Returns a group page.
1313
14-
Templates: ``groups/group_page.html``
14+
Templates: ``groups/pages/page_detail.html``
1515
Context:
1616
group
1717
Group object
@@ -32,7 +32,7 @@ def page_create(request, slug, page_slug,
3232
"""
3333
Creates a group page.
3434
35-
Templates: `` groups/group_page_form.html``
35+
Templates: ``groups/pages/page_form.html``
3636
Context:
3737
group
3838
Group object

‎basic/groups/views/topics.py‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def topic_list(request, slug, template_name='groups/topics/topic_list.html'):
1010
"""
1111
Returns a group topic list page.
1212
13-
Templates: ``groups/topic_list.html``
13+
Templates: ``groups/topics/topic_list.html``
1414
Context:
1515
group
1616
Group object
@@ -30,7 +30,7 @@ def topic_create(request, slug, template_name='groups/topics/topic_form.html'):
3030
"""
3131
Returns a group topic form page.
3232
33-
Templates: ``groups/topic_form.html``
33+
Templates: ``groups/topics/topic_form.html``
3434
Context:
3535
form
3636
GroupTopicForm object
@@ -57,7 +57,7 @@ def topic_detail(request, slug, topic_id,
5757
"""
5858
Returns a group topic detail page.
5959
60-
Templates: ``groups/topic_detail.html``
60+
Templates: ``groups/topics/topic_detail.html``
6161
Context:
6262
topic
6363
GroupTopic object
@@ -79,7 +79,7 @@ def topic_edit(request, topic_id, template_name='groups/topics/topic_form.html')
7979
"""
8080
Returns a group topic form page.
8181
82-
Templates: ``groups/topic_form.html``
82+
Templates: ``groups/topics/topic_form.html``
8383
Context:
8484
form
8585
GroupTopicForm object
@@ -108,7 +108,7 @@ def topic_remove(request, topic_id,
108108
"""
109109
Returns a group topic delete confirmation page.
110110
111-
Templates: ``groups/topic_remove_confirm.html``
111+
Templates: ``groups/topics/topic_remove_confirm.html``
112112
Context:
113113
topic
114114
GroupTopic object
@@ -120,8 +120,3 @@ def topic_remove(request, topic_id,
120120
topic.save()
121121
return redirect(request, group)
122122
return render(request, template_name, {'topic': topic})
123-
124-
125-
def topic_moderate(request, topic_id,
126-
template_name='groups/topics/topic_moderate_confirm.html'):
127-
pass

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL