[#1200] fix more issues with pull request

ckan · Oct 23, 2013 · 9359e8d · 9359e8d
1 parent ad4e793
commit 9359e8d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/ckan/templates/package/resource_data.html b/ckan/templates/package/resource_data.html
@@ -18,7 +18,7 @@
     <div class="alert alert-error">
       <strong>{{ _('Upload error:') }}</strong> {{ status.error.message }}
     </div>
-  {% elif status.task_info.error %}
+  {% elif status.task_info and status.task_info.error %}
     {% set show_table = false %}
     <div class="alert alert-error">
       <strong>{{ _('Error:') }}</strong> {{ status.task_info.error }}

diff --git a/ckanext/datapusher/logic/action.py b/ckanext/datapusher/logic/action.py
@@ -186,11 +186,13 @@ def datapusher_status(context, data_dict):
     job_id = value.get('job_id')
     url = None
     job_detail = None
+
     if job_id:
         url = urlparse.urljoin(datapusher_url, 'job' + '/' + job_id)
         try:
             r = requests.get(url, headers={'Content-Type': 'application/json',
                                            'Authorization': job_key})
+            r.raise_for_status()
             job_detail = r.json()
         except (requests.exceptions.ConnectionError,
                 requests.exceptions.HTTPError), e:

diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
@@ -96,15 +96,13 @@ def datastore_create(context, data_dict):
 
         # create resource from file
         if has_url:
-            try:
-                p.toolkit.get_action('datapusher_submit')(context, {
-                    'resource_id': res['id'],
-                    'set_url_type': True
-                })
-            except KeyError:
+            if not 'datapusher' in pylons.config.get('plugins'):
                 raise p.toolkit.ValidationError({'resource': [
                     'The datapusher has to be enabled.']})
-
+            p.toolkit.get_action('datapusher_submit')(context, {
+                'resource_id': res['id'],
+                'set_url_type': True
+            })
             # since we'll overwrite the datastore resource anyway, we
             # don't need to create it here
             return