Merge lp:~daker/loco-team-portal/fix.707123 into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed bug 707123, props svwilliams

=== modified file 'loco_directory/meetings/urls.py'
--- loco_directory/meetings/urls.py	2012-12-04 21:25:51 +0000
+++ loco_directory/meetings/urls.py	2013-04-14 23:02:24 +0000
@@ -17,6 +17,7 @@
     url(r'^add/$', 'meetings.views.team_meeting_select', name='team-meeting-select'),
 
     url(r'^team/(?P<team_meeting_id>\d+)/agenda/(?P<agenda_item_id>\d+)/delete/$', 'meetings.views.agenda_item_delete', name='agenda-item-delete'),
+    url(r'^team/(?P<team_meeting_id>\d+)/agenda/(?P<agenda_item_id>\d+)/add-child/$', 'meetings.views.agenda_item_new', name='agenda-item-add-child'),
     url(r'^team/(?P<team_meeting_id>\d+)/agenda/(?P<agenda_item_id>\d+)/update/$', 'meetings.views.agenda_item_update', name='agenda-item-update'),
     url(r'^team/(?P<team_meeting_id>\d+)/agenda/add/$', 'meetings.views.agenda_item_new', name='agenda-item-new'),
 

=== modified file 'loco_directory/meetings/views.py'
--- loco_directory/meetings/views.py	2013-03-31 12:32:27 +0000
+++ loco_directory/meetings/views.py	2013-04-14 23:02:24 +0000
@@ -275,27 +275,37 @@
         context = {
             'form': form,
         }
-        return render_to_response('meetings/team_meeting_update.html',
-                                         context, RequestContext(request))
+        return render_to_response(
+            'meetings/team_meeting_update.html',
+            context,
+            RequestContext(request)
+        )
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting.'), _('You are not a member of the team or on the LoCo Council.')))
         return redirect(team_meeting_object)
 
 
 @login_required
-def agenda_item_new(request, team_meeting_id):
+def agenda_item_new(request, team_meeting_id, agenda_item_id=None):
     """
     new agenda item
     """
     team_meeting_object = get_object_or_404(TeamMeeting, pk=team_meeting_id)
     try:
         user = UserProfile.objects.get(user=request.user)
-        agenda_item_object = AgendaItem(meeting=team_meeting_object,
-                                   owner=user,
-                                   created_date=datetime.datetime.now())
+        agenda_item_object = AgendaItem(
+            meeting=team_meeting_object,
+            owner=user,
+            created_date=datetime.datetime.now()
+        )
     except UserProfile.DoesNotExist:
-        agenda_item_object = AgendaItem(meeting=team_meeting_object,
-                                   created_date=datetime.datetime.now())
+        agenda_item_object = AgendaItem(
+            meeting=team_meeting_object,
+            created_date=datetime.datetime.now()
+        )
+
+    if agenda_item_id is not None:
+        agenda_item_object.parent = get_object_or_404(AgendaItem, pk=agenda_item_id)
     is_member = False
     for team in team_meeting_object.teams.all():
         if launchpad.is_team_member(request.user, team):

=== modified file 'loco_directory/templates/meetings/agenda_item_update.html'
--- loco_directory/templates/meetings/agenda_item_update.html	2013-03-31 12:32:27 +0000
+++ loco_directory/templates/meetings/agenda_item_update.html	2013-04-14 23:02:24 +0000
@@ -5,6 +5,7 @@
 
 {% block sub_nav_links %}
 <li><a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url agenda-item-add-child team_meeting_object.id agenda_item_object.id %}">{% trans "Add Child Item" %}</a></li>
 <li><a class="sub-nav-item" href="{% url agenda-item-delete team_meeting_object.id agenda_item_object.id %}">{% trans "Delete Agenda Item" %}</a></li>
 {% endblock %}
 

=== modified file 'loco_directory/templates/meetings/team_meeting_detail.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail.inc.html	2012-12-12 23:47:58 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.inc.html	2013-04-14 23:02:24 +0000
@@ -4,12 +4,9 @@
         <div class="box_content">
             <div class="pagelet">
                 <h3>{{ team_meeting_object.name }}</h3>
-
                 {% include "meetings/team_meeting_detail_basic.inc.html" %}
             </div>
-
             {% include "meetings/team_meeting_detail_agenda.inc.html" %}
-
         </div>
     </section>
 </div>

=== modified file 'loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html	2013-03-11 12:30:52 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html	2013-04-14 23:02:24 +0000
@@ -1,7 +1,7 @@
 {% load i18n markup %}
 {% load recurse %}
 {% if user_is_team_member %}
-    <a href="{% url agenda-item-new team_meeting_object.id %}">{% trans 'Add Agenda Item' %}</a>
+    <a style="margin-bottom: 10px;" class="contact-button" href="{% url agenda-item-new team_meeting_object.id %}">{% trans 'Add Agenda Item' %}</a>
 {% endif %}
 
 {% if team_meeting_object.agenda %}