[#1470] add full page view edit form option for use with dashboards etc

ckan · Feb 6, 2014 · 4e071a9 · 4e071a9
1 parent 4c98742
commit 4e071a9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -1685,11 +1685,18 @@ def resource_view_icon(resource_view):
 
 def resource_view_display_preview(resource_view):
     '''
-    Returns the icon for a particular view type.
+    Returns if the view should display a preview.
     '''
     view_plugin = datapreview.get_view_plugin(resource_view['view_type'])
     return view_plugin.info().get('preview_enabled', True)
 
+def resource_view_full_page(resource_view):
+    '''
+    Returns if the endit view page should be full page.
+    '''
+    view_plugin = datapreview.get_view_plugin(resource_view['view_type'])
+    return view_plugin.info().get('full_page_edit', False)
+
 def resource_view_dimensions(resource_view):
     '''
     Returns the icon for a particular view type.
@@ -1913,6 +1920,7 @@ def check_config_permission(permission):
     'resource_view_icon',
     'resource_view_dimensions',
     'resource_view_display_preview',
+    'resource_view_full_page',
     'SI_number_span',
     'localised_number',
     'localised_SI_number',

diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
@@ -922,6 +922,7 @@ def resource_view_show(context, data_dict):
 
     resource_view = model.ResourceView.get(id)
     if not resource_view:
+        _check_access('resource_view_show', context, data_dict)
         raise NotFound
 
     context['resource_view'] = resource_view

diff --git a/ckan/templates/package/view_edit_base.html b/ckan/templates/package/view_edit_base.html
@@ -20,7 +20,16 @@
 {% endblock %}
 
 {% block main_content %}
-  {{ super() }}
+  {% if h.resource_view_full_page(resource_view) %}
+    {{ self.flash() }}
+    {{ self.toolbar() }}
+    <div class="wrapper no-nav">
+      {{ self.primary_content() }}
+    </div>
+  {% else %}
+    {{ super() }}
+  {% endif %}
+
   {% if to_preview and h.resource_view_display_preview(resource_view) %}
     <div class="wrapper no-nav">
       <section class="module module-narrow module-shallow">
@@ -35,6 +44,12 @@ <h2 class="module-heading">
   {% endif %}
 {% endblock %}
 
+{% block secondary %}
+  {% if not h.resource_view_full_page(resource_view) %}
+    {{ super() }}
+  {% endif %}
+{% endblock %}
+
 {% block secondary_content %}
   {% snippet 'package/snippets/view_help.html' %}
 {% endblock %}
diff --git a/ckanext/imageview/plugin.py b/ckanext/imageview/plugin.py
@@ -23,9 +23,7 @@ def info(self):
                 'title': 'Image',
                 'icon': 'picture',
                 'schema': {'image_url': [ignore_empty, unicode]},
-                'iframed': False,
-                'sizex': 3,
-                'sizey': 3}
+                'iframed': False}
 
     def can_view(self, data_dict):
         return True