Fixed history display

Author: njl

Diff for: fill_db_with_fakes.py

@@ -56,7 +56,7 @@ def main():
                 l.vote(random.choice(user_ids), prop_id, vote)
 
         if random.randint(0, 3) == 0:
-            data['notes'] = 'UPDATED' + ipsum(2)
+            data['description'] = 'UPDATED ' + ipsum(4)
             l.add_proposal(data)
 
 

Diff for: logic.py

@@ -193,9 +193,10 @@ def add_proposal(data):
         return None
 
     q = 'UPDATE proposals SET data=%s, data_history=%s, updated=now() WHERE id=%s'
-    proposal.data['when'] = proposal.updated.isoformat()
+    new_data = cleaned_data.copy()
+    new_data['when'] = datetime.datetime.now().isoformat()
     data_history = proposal.data_history
-    data_history.append(proposal.data)
+    data_history.insert(0, new_data)
     execute(q, (Json(cleaned_data), Json(data_history), data['id']))
 
     return data['id']

Diff for: templates/proposal_render.html

@@ -12,7 +12,7 @@
   <div class="tab-content">
     {% for version in proposal.data_history%}
     <div class="tab-pane{%if loop.first%} active{%endif%}" id="rev-{{loop.index0}}">
-        <h1>{{version.title}}</h1>
+        <h1>{{version.title}} {{loop.index0}}</h1>
         <table class="table">
           <tbody>
               <tr><th>Category</th>
@@ -31,7 +31,7 @@ <h1>{{version.title}}</h1>
               <tr><th>Created</th>
               <td>{{proposal.added_on|date}}</td></tr>
               <tr><th>Last Updated</th>
-              <td>{{proposal.updated|date}}</td></tr>
+              <td>{{version.when}}</td></tr>
               {%endif%}
           </tbody>
         </table>