Changeset 2104 for trunk/loreality/loreality/controllers/campaign.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/campaign.py (modified) (4 diffs)

trunk/loreality/loreality/controllers/campaign.py

@@ -22 +22 @@
 class CampaignController(BaseController):
 
+    #--------------------------------------------------------------
     def index(self, values=None, errors=None ):
-        c.title = "LoReality"
-        c.heading = "Campaign"
+        c.title = "All campaigns"
+        c.heading = "Campaigns"
         c.campaigns = meta.Session.query(model.Campaign).all()
+
+        html = render('/derived/page/overview_campaign.html')
+        return  htmlfill.render(html, defaults=values, errors=errors)
+
+    #--------------------------------------------------------------
+    def view(self, id, values=None, errors=None ):
+        if id is None:
+            abort(404)
+        campaign_q = meta.Session.query(model.Campaign)
+        campaign = campaign_q.filter_by(id=uuid.UUID(id)).first()
+        if campaign is None:
+            abort(404)
+
+        c.title = campaign.name
+        c.heading = "Campaigns"
+        c.campaign = campaign
 
         html = render('/derived/page/campaign.html')
         return  htmlfill.render(html, defaults=values, errors=errors)
 
+    #--------------------------------------------------------------
     def process(self, id=None):
         action = request.params.getone('action')
@@ -98 +116 @@
 
                 campaign.name = result["name"]
+                campaign.description = result["description"]
                 meta.Session.commit()
-                return self.edit(id=id) 
+                return self.view(id=id) 
         else:
             raise Exception('Invalid action %s'%action)
 
+    #--------------------------------------------------------------
     @authorize(h.auth.is_creator)
     def edit(self, id=None, values=None, errors=None  ):
@@ -112 +132 @@
             abort(404)
 
-        c.title = "LoReality"
-        c.heading = "Edit %s"%campaign.name
+        c.title = "Edit %s"%campaign.name
+        c.heading = "Campaigns"
         c.campaign = campaign
 
         if not values: values = {}
         values["name"] = campaign.name
+        values["description"] = campaign.description
 
         html = render('/derived/page/campaign_edit.html')
         return  htmlfill.render(html, defaults=values, errors=errors)
 
+    #--------------------------------------------------------------
     @authorize(h.auth.is_creator)
     def delete(self, id):
@@ -146 +168 @@
         return self.edit( id )
 
+    #--------------------------------------------------------------
     @authorize(h.auth.is_creator)
     def deletecampaign(self, id):