[cig-commits] r4431 - in cs/framework/trunk/cig: seismo web web/seismo/events/templates/events

[leif at geodynamics.org]

Author: leif
Date: 2006-08-24 19:36:10 -0700 (Thu, 24 Aug 2006)
New Revision: 4431

Modified:
   cs/framework/trunk/cig/seismo/events.py
   cs/framework/trunk/cig/web/managers.py
   cs/framework/trunk/cig/web/seismo/events/templates/events/event_search_results.html
Log:
Minor bug fixes.


Modified: cs/framework/trunk/cig/seismo/events.py
===================================================================
--- cs/framework/trunk/cig/seismo/events.py	2006-08-25 00:25:22 UTC (rev 4430)
+++ cs/framework/trunk/cig/seismo/events.py	2006-08-25 02:36:10 UTC (rev 4431)
@@ -122,6 +122,7 @@
     def _getMrpStr2f(self): return "%.2f" % (self.Mrp * 1.0e-26)
     def _getMtpStr2f(self): return "%.2f" % (self.Mtp * 1.0e-26)
 
+    def _getMinuteStr(self): return "%02d" % self.minute
     def _getSecond(self): return int(self._second)
     def _getSecondStr(self): return "%02d" % self.second
     def _getMicrosecond(self): return int((self._second - float(int(self._second))) * 1000000)
@@ -133,6 +134,7 @@
     mrp = property(_getMrpStr2f)
     mtp = property(_getMtpStr2f)
     
+    minuteStr = property(_getMinuteStr)
     second = property(_getSecond)
     secondStr = property(_getSecondStr)
     microsecond = property(_getMicrosecond)

Modified: cs/framework/trunk/cig/web/managers.py
===================================================================
--- cs/framework/trunk/cig/web/managers.py	2006-08-25 00:25:22 UTC (rev 4430)
+++ cs/framework/trunk/cig/web/managers.py	2006-08-25 02:36:10 UTC (rev 4431)
@@ -44,7 +44,7 @@
 
 from django.db import models
 from django.db.models.fields import FieldDoesNotExist
-from middleware import get_current_user
+from models import CurrentUser
 
 
 class CurrentUserManager(models.Manager):
@@ -77,7 +77,7 @@
                 raise ValueError, "%s couldn't find a field named %s in %s." % \
                     (self.__class__.__name__, self.__field_name, self.model._meta.object_name)
             self.__is_validated = True
-        return super(CurrentUserManager, self).get_query_set().filter(**{self.__field_name + '__id__exact': get_current_user().id})
+        return super(CurrentUserManager, self).get_query_set().filter(**{self.__field_name + '__exact': CurrentUser()})
 
 
 # end of file

Modified: cs/framework/trunk/cig/web/seismo/events/templates/events/event_search_results.html
===================================================================
--- cs/framework/trunk/cig/web/seismo/events/templates/events/event_search_results.html	2006-08-25 00:25:22 UTC (rev 4430)
+++ cs/framework/trunk/cig/web/seismo/events/templates/events/event_search_results.html	2006-08-25 02:36:10 UTC (rev 4431)
@@ -31,7 +31,7 @@
 	        <form method="post" action="../add/">
 		    <input type="hidden" name="dataSource"       value="{{ event.dataSource }}"/>
 		    <input type="hidden" name="when_date"        value="{{ event.year }}-{{ event.month }}-{{ event.day }}"/>
-		    <input type="hidden" name="when_time"        value="{{ event.hour }}:{{ event.minute }}:{{ event.secondStr }}"/>
+		    <input type="hidden" name="when_time"        value="{{ event.hour }}:{{ event.minuteStr }}:{{ event.secondStr }}"/>
 		    <input type="hidden" name="microsecond"      value="{{ event.microsecond }}"/>
 		    <input type="hidden" name="sourceLatitude"   value="{{ event.sourceLatitude }}"/>
 		    <input type="hidden" name="sourceLongitude"  value="{{ event.sourceLongitude }}"/>
@@ -51,6 +51,7 @@
 		    <input type="hidden" name="Mrt"              value="{{ event.Mrt }}"/>
 		    <input type="hidden" name="Mrp"              value="{{ event.Mrp }}"/>
 		    <input type="hidden" name="Mtp"              value="{{ event.Mtp }}"/>
+		    <input type="hidden" name="user"             value="{{ user.id }}"/>
 		<input type="submit" value="Add" />
 		</form>
 	    </td>