Hide 'slots' and add 'slots_desired'
authorSverre Rabbelier <srabbelier@gmail.com>
Sun, 08 Mar 2009 23:58:27 +0000
changeset 1760 393891d794e2
parent 1759 94b64c07f7ce
child 1761 cf39e8705fac
Hide 'slots' and add 'slots_desired' Patch by: Sverre Rabbelier
app/soc/models/organization.py
app/soc/templates/soc/program/allocation/heading.html
app/soc/templates/soc/program/allocation/row.html
app/soc/views/models/organization.py
--- a/app/soc/models/organization.py	Sun Mar 08 21:59:57 2009 +0000
+++ b/app/soc/models/organization.py	Sun Mar 08 23:58:27 2009 +0000
@@ -56,3 +56,9 @@
       verbose_name=ugettext('Slots allocated'))
   slots.help_text = ugettext(
       'The amount of slots allocated to this organization.')
+
+  slots_desired = db.IntegerProperty(required=False, default=0,
+      verbose_name=ugettext('Slots desired'))
+  slots_desired.help_text = ugettext(
+      'The amount of slots desired by this organization.')
+
--- a/app/soc/templates/soc/program/allocation/heading.html	Sun Mar 08 21:59:57 2009 +0000
+++ b/app/soc/templates/soc/program/allocation/heading.html	Sun Mar 08 23:58:27 2009 +0000
@@ -1,5 +1,6 @@
 <tr align="left">
   <th>Name</th>
+  <th>Desired</th>
   <th>Locked?</th>
   <th>Slots</th>
   <th>Adjustment</th>
--- a/app/soc/templates/soc/program/allocation/row.html	Sun Mar 08 21:59:57 2009 +0000
+++ b/app/soc/templates/soc/program/allocation/row.html	Sun Mar 08 23:58:27 2009 +0000
@@ -1,5 +1,6 @@
 <tr class="off" onmouseover="this.className='on'" onmouseout="this.className='off'" name="name">
   <td><div class="name">{{ list.item.name }}</div></td>
+  <td><div class="desired">{{ list.item.slots_desired }}</div></td>
   <td>
       <div class="locked" id="locked_slot_count_{{ list.item.link_id }}">
       <input type="checkbox" id="id_locked_slot_{{ list.item.link_id }}"
--- a/app/soc/views/models/organization.py	Sun Mar 08 21:59:57 2009 +0000
+++ b/app/soc/views/models/organization.py	Sun Mar 08 23:58:27 2009 +0000
@@ -106,6 +106,8 @@
     new_params['group_applicant_url'] = True
     new_params['sans_link_id_public_list'] = True
 
+    new_params['extra_dynaexclude'] = ['slots']
+
     patterns = []
 
     patterns += [