Merge lp:~svwilliams/loco-team-portal/707123-add-child-task-from-update into lp:loco-team-portal

[Stephen V. Williams]

/templates/meeting/agenda_item_update.html - Added a link-button to update the take the user to add-item-add-child passing team meeting and agenda item
meeting/url.py - Added a url redirect linking the add-item-add-child to add-item-new
meeting/view.py - Added agenda-item-id to add-item new setting it to None automatically and set the parent id of the new agenda item if it is set

/templates/meeting/agenda_item_update.html - Added a link-button to update the take the user to add-item-add-child passing team meeting and agenda item
meeting/url.py - Added a url redirect linking the add-item-add-child to add-item-new
meeting/view.py - Added agenda-item-id to add-item new setting it to None automatically and set the parent id of the new agenda item if it is set

Does not save the update agenda item before going to the new agenda item. This may need to be done before this is pushed in or could be set as another bitsize bug ... up to the reviewer

[Michael Hall (mhall119)]

On line 21 of the diff, attribute=none doesn't seem to belong. What is this for?

review: Needs Fixing

[Adnane Belmadiaf (daker)]

Hey Stephen, any update on this ?

[Stephen V. Williams (svwilliams)]

Hi Adnane,

I'll have to double check. I got behind on all of the stuff I was doing for
the portal with changing jobs and moving to Colorado. I'll check tonight
and get back with you ASAP. My recollection is I fixed the line, but I may
have forgotten to push to launchpad.

Thank you,
Stephen

*Stephen V. Williams*
Software Engineer

<http://plus.google.com/110344925712015359478/about>

On Mon, Nov 5, 2012 at 2:22 PM, Adnane Belmadiaf <email address hidden>wrote:

> Hey Stephen, any update on this ?
> --
>
> https://code.launchpad.net/~svwilliams/loco-team-portal/707123-add-child-task-from-update/+merge/82802
> You are the owner of
> lp:~svwilliams/loco-team-portal/707123-add-child-task-from-update.
>

[Adnane Belmadiaf (daker)]

Thanks Stephen i have merged this.

=== modified file 'loco_directory/meetings/urls.py'
--- loco_directory/meetings/urls.py	2011-03-16 18:35:53 +0000
+++ loco_directory/meetings/urls.py	2011-11-19 23:27: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	2011-03-18 13:37:13 +0000
+++ loco_directory/meetings/views.py	2011-11-19 23:27:24 +0000
@@ -259,7 +259,7 @@
                 return redirect( team_meeting_object )
         else:
             form = TeamMeetingForm(instance=team_meeting_object)
-            
+            attribute=none
         context = {
             'form': form,
         }
@@ -270,10 +270,11 @@
         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)
@@ -283,6 +284,11 @@
     except UserProfile.DoesNotExist:
         agenda_item_object = AgendaItem(meeting=team_meeting_object, 
                                    created_date=datetime.datetime.now())
+	
+	#coming from another agenda item we pass the agenda id to set it as the parent
+    if agenda_item_id != 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):
@@ -311,11 +317,13 @@
         request.user.message_set.create(message='%s %s' % (_('You can not add a new agenda item for 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_update(request, team_meeting_id, agenda_item_id):
     """
     update agenda item
     """
+    
     team_meeting_object = get_object_or_404(TeamMeeting, pk=team_meeting_id)
     agenda_item_object = get_object_or_404(AgendaItem, pk=agenda_item_id)
     #check if user is admin or owner of a team

=== modified file 'loco_directory/templates/meetings/agenda_item_update.html'
--- loco_directory/templates/meetings/agenda_item_update.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/meetings/agenda_item_update.html	2011-11-19 23:27:24 +0000
@@ -6,6 +6,7 @@
 {% block sub_nav_links %}
 <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>
 <a class="sub-nav-item" href="{% url agenda-item-delete team_meeting_object.id agenda_item_object.id %}">{% trans "Delete Agenda Item" %}</a>
+<a class="sub-nav-item" href="{% url agenda-item-add-child team_meeting_object.id agenda_item_object.id %}">{% trans "Add Child Item" %}</a>
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}