Changeset 2104 for trunk/loreality/loreality/controllers/mission.py

Timestamp:

07/05/10 12:56:53 (23 months ago)

Author:

dart

Message:

LoReality?:
o Add squadrons, pilots.
o Lot of fix
o Some cosmetics

File:

• trunk/loreality/loreality/controllers/mission.py (modified) (6 diffs)

trunk/loreality/loreality/controllers/mission.py

@@ -22 +22 @@
 
 class MissionController(BaseController):
+    #--------------------------------------------------------------
+    def _get_pilots(self, already_pilots):
+        pilots = meta.Session.query(model.Pilot).all()
+        names = []
+        for p in pilots:
+            if p not in already_pilots:
+                names.append( p.name )
+        return names
 
+    #--------------------------------------------------------------
     def view(self, id, values=None, errors=None ):
         if id is None:
@@ -34 +43 @@
         c.heading = mission.name
         c.mission = mission
+        c.available_pilots = self._get_pilots(mission.pilots)
 
         html = render('/derived/page/mission.html')
         return  htmlfill.render(html, defaults=values, errors=errors)
 
+    #--------------------------------------------------------------
     def process(self, id=None):
         action = request.params.getone('action')
@@ -67 +78 @@
         else:
             raise Exception('Invalid action %s'%action)
+    #--------------------------------------------------------------
     @authorize(h.auth.is_creator)
     def edit(self, id=None, values=None, errors=None  ):
@@ -79 +91 @@
         c.heading = "Edit %s"%mission.name
         c.mission = mission
+        c.available_pilots = self._get_pilots(mission.pilots)
 
         if not values: values = {}
@@ -85 +98 @@
         html = render('/derived/page/mission_edit.html')
         return  htmlfill.render(html, defaults=values, errors=errors)
+    #--------------------------------------------------------------
     @authorize(h.auth.is_creator)
     def addpilot(self, id):
         values = dict(request.params)
-        pilotid = values["pilotid"]
+        pilotid = values["Pilot"]
         if id is None:
             abort(404)
@@ -99 +113 @@
             abort(404)
         pilot_q = meta.Session.query(model.Pilot)
-        pilot = pilot_q.filter_by(id=uuid.UUID(pilotid)).first()
+        pilot = pilot_q.filter_by(name=pilotid).first()
         if pilot is None:
             abort(404)
        
         #- del now
-        mission.pilots.add( pilot )
+        mission.pilots.append( pilot )
         meta.Session.commit()
         return self.edit( id )
+    #--------------------------------------------------------------
     @authorize(h.auth.is_creator)
     def removepilot(self, id):