Merge branch 'master' into enh-1803-clean-up-routes

ckan · Feb 22, 2012 · 286288e · 286288e
2 parents 3cc21d8 + 707297e
commit 286288e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ckan/lib/activity.py b/ckan/lib/activity.py
@@ -92,6 +92,12 @@ def before_commit(self, session):
             objects = object_cache[activity_type]
             for obj in objects:
                 logger.debug("Looking at %s object %s" % (activity_type, obj))
+
+                if not hasattr(obj,"id"):
+                    logger.debug("Object has no id, skipping...")
+                    continue
+
+
                 if activity_type == "new" and obj.id in activities:
                     logger.debug("This object was already logged as a new "
                             "package")

diff --git a/ckan/templates/js_strings.html b/ckan/templates/js_strings.html
@@ -22,7 +22,7 @@
   CKAN.Strings.failedToSave = "${_('Failed to save, possibly due to invalid data ')}";
   CKAN.Strings.addDataset = "${_('Add Dataset')}";
   CKAN.Strings.addGroup = "${_('Add Group')}";
-  CKAN.Strings.youHaveUnsavedChanges = "${_("You have unsaved changed. Make sure to click 'Save Changes' below before leaving this page.")}";
+  CKAN.Strings.youHaveUnsavedChanges = "${_("You have unsaved changes. Make sure to click 'Save Changes' below before leaving this page.")}";
   CKAN.Strings.loading = "${_('Loading...')}";
   CKAN.Strings.noNameBrackets = "${_('(no name)')}";
   CKAN.Strings.deleteThisResourceQuestion = "${_('Delete the resource \'%name%\'?')}"