Commits

Stephen McDonald committed 3743c2c Merge

Automated merge with ssh://bitbucket.org/stephenmcd/mezzanine

  • Participants
  • Parent commits e3e80ad, aa565f0

Comments (0)

Files changed (2)

File mezzanine/generic/models.py

 
     keyword = models.ForeignKey("Keyword", related_name="assignments")
     content_type = models.ForeignKey("contenttypes.ContentType")
-    object_pk = models.TextField()
+    object_pk = models.IntegerField()
     content_object = GenericForeignKey("content_type", "object_pk")
 
     def __unicode__(self):
 
     value = models.IntegerField(_("Value"))
     content_type = models.ForeignKey("contenttypes.ContentType")
-    object_pk = models.TextField()
+    object_pk = models.IntegerField()
     content_object = GenericForeignKey("content_type", "object_pk")
 
     class Meta:

File mezzanine/project_template/manage.py

     mezzanine_path = path_for_import("mezzanine")
     assert os.path.abspath(os.path.join(mezzanine_path, "..")) == dev_path
 
+# Corrects some pathing issues in various contexts, such as cron jobs.
+os.chdir(project_path)
+
 from django.core.management import execute_manager
 try:
     import settings  # Assumed to be in the same directory.