[1608] Cleaned up revision message (removed None) and allow resource …

…owners to update them.
ckan · Jan 10, 2012 · 8c1a7c6 · 8c1a7c6
1 parent 69792aa
commit 8c1a7c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py
@@ -166,6 +166,7 @@ def resource_update(context, data_dict):
     context["resource"] = resource
 
     if not resource:
+        logging.error('Could not find resource ' + id)
         raise NotFound(_('Resource was not found.'))
 
     check_access('resource_update', context, data_dict)
@@ -181,7 +182,7 @@ def resource_update(context, data_dict):
     if 'message' in context:
         rev.message = context['message']
     else:
-        rev.message = _(u'REST API: Update object %s') % data.get("name")
+        rev.message = _(u'REST API: Update object %s') % data.get("name", "")
 
     resource = resource_dict_save(data, context)
     if not context.get('defer_commit'):

diff --git a/ckan/logic/auth/update.py b/ckan/logic/auth/update.py
@@ -159,8 +159,9 @@ def task_status_update(context, data_dict):
         id = data_dict.get('entity_id',None)
         resource = model.Resource.get(id)
 
-    if resource.revision.author == user:
-        return {'success': True}
+    if resource and resource.revision:
+        if resource.revision.author == user:
+            return {'success': True}        
 
     authorized =  Authorizer().is_sysadmin(unicode(user))
     if not authorized: