Revert "[#2888] first attempt and datapreview on its own"

This reverts commit 2e491fd.
ckan · Aug 23, 2012 · 7458492 · 7458492
1 parent 2e491fd
commit 7458492
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 107 deletions.
diff --git a/ckan/config/routing.py b/ckan/config/routing.py
@@ -194,9 +194,6 @@ def make_map():
           )
         m.connect('/dataset/{id}.{format}', action='read')
         m.connect('/dataset/{id}', action='read')
-
-        m.connect('/datapreview/{resource_id}', action='data_preview')
-
         m.connect('/dataset/{id}/resource/{resource_id}',
                   action='resource_read')
         m.connect('/dataset/{id}/resource/{resource_id}/download',

diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
@@ -794,21 +794,6 @@ def resource_read(self, id, resource_id):
         c.related_count = c.pkg.related_count
         return render('package/resource_read.html')
 
-    def data_preview(self, resource_id):
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user or c.author}
-
-        try:
-            c.resource = get_action('resource_show')(context,
-                                                     {'id': resource_id})
-            c.resource_json = json.dumps(c.resource)
-            c.pkg_dict = c.package
-        except NotFound:
-            abort(404, _('Resource not found'))
-        except NotAuthorized:
-            abort(401, _('Unauthorized to read resource %s') % id)
-        return render('package/datapreview.html')
-
     def resource_download(self, id, resource_id):
         """
         Provides a direct download by redirecting the user to the url stored

diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
@@ -46,11 +46,6 @@ CKAN.Utils = CKAN.Utils || {};
       CKAN.DataPreview.loadPreviewDialog(preload_resource);
     }
 
-    var isResourceViewNew = $('#ckanext-datapreview').length > 0;
-    if (isResourceViewNew) {
-      CKAN.DataPreview.loadPreviewDialog(preload_resource);
-    }
-
     var isEmbededDataviewer = $('body.package.resource_embedded_dataviewer').length > 0;
     if (isEmbededDataviewer) {
       CKAN.DataPreview.loadEmbeddedPreview(preload_resource, reclineState);

diff --git a/ckan/templates/package/datapreview.html b/ckan/templates/package/datapreview.html
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
@@ -575,33 +575,6 @@ def test_search_limit(self):
         assert result['total'] == 2
         assert result['records'] == [self.expected_records[0]]
 
-
-        data = {'resource_id': self.data['resource_id'],
-                'limit': 0}
-        postparams = '%s=1' % json.dumps(data)
-        auth = {'Authorization': str(self.sysadmin_user.apikey)}
-        res = self.app.post('/api/action/datastore_search', params=postparams,
-                            extra_environ=auth)
-        res_dict = json.loads(res.body)
-        assert res_dict['success'] is True
-        result = res_dict['result']
-        assert result['total'] == 2
-        assert result['records'] == []
-
-        #filter returns no results with 0 limit
-        data = {'resource_id': self.data['resource_id'],
-                'limit': 0,
-                'filters': {u'b\xfck': 'annakar'}}
-        postparams = '%s=1' % json.dumps(data)
-        auth = {'Authorization': str(self.sysadmin_user.apikey)}
-        res = self.app.post('/api/action/datastore_search', params=postparams,
-                            extra_environ=auth)
-        res_dict = json.loads(res.body)
-        assert res_dict['success'] is True
-        result = res_dict['result']
-        assert result['total'] == 0
-        assert result['records'] == []
-
     def test_search_invalid_limit(self):
         data = {'resource_id': self.data['resource_id'],
                 'limit': 'bad'}