Merge branch 'master' of github.com:okfn/ckan

ckan/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.6.1a'
+__version__ = '1.6.1b'
 __description__ = 'Comprehensive Knowledge Archive Network (CKAN) Software'
 __long_description__ = \
 '''CKAN software provides a hub for datasets. The flagship site running CKAN 

ckan/config/solr/schema-1.3.xml

@@ -138,6 +138,11 @@
 
     <field name="indexed_ts" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
 
+    <!-- Copy the title field into titleString, and treat as a string
+         (rather than text type).  This allows us to sort on the titleString -->
+    <field name="titleString" type="string" indexed="true" stored="false" />
+    <copyField source="title" dest="titleString"/>
+
     <dynamicField name="extras_*" type="text" indexed="true" stored="true" multiValued="false"/>
     <dynamicField name="*" type="string" indexed="true"  stored="false"/>
 </fields>

ckan/controllers/group.py

@@ -36,9 +36,26 @@ def _db_to_form_schema(self, group_type=None):
     def _setup_template_variables(self, context, data_dict, group_type=None):
         return lookup_group_plugin(group_type).setup_template_variables(context,data_dict)
 
+    def _new_template(self,group_type):
+        from ckan.lib.helpers import default_group_type
+        return lookup_group_plugin(group_type).new_template()
+
+    def _index_template(self,group_type):
+        from ckan.lib.helpers import default_group_type
+        return lookup_group_plugin(group_type).index_template()
+
+    def _read_template(self, group_type):
+        return lookup_group_plugin(group_type).read_template()
+
+    def _history_template(self, group_type):
+        return lookup_group_plugin(group_type).history_template()
+
     ## end hooks
 
     def index(self):
+        group_type = request.path.strip('/').split('/')[0]
+        if group_type == 'group':
+            group_type = None
 
         context = {'model': model, 'session': model.Session,
                    'user': c.user or c.author}
@@ -58,7 +75,7 @@ def index(self):
             url=h.pager_url,
             items_per_page=20
         )
-        return render('group/index.html')
+        return render( self._index_template(group_type) )
 
 
     def read(self, id):
@@ -170,7 +187,7 @@ def pager_url(q=None, page=None):
                 ckan.logic.action.get.group_activity_list_html(context,
                     {'id': c.group_dict['id']})
 
-        return render('group/read.html')
+        return render( self._read_template(c.group_dict['type']) )
 
     def new(self, data=None, errors=None, error_summary=None):
         group_type = request.path.strip('/').split('/')[0]
@@ -198,7 +215,7 @@ def new(self, data=None, errors=None, error_summary=None):
 
         self._setup_template_variables(context,data)
         c.form = render(self._group_form(group_type=group_type), extra_vars=vars)
-        return render('group/new.html')
+        return render(self._new_template(group_type))
 
     def edit(self, id, data=None, errors=None, error_summary=None):
         group_type = self._get_group_type(id.split('@')[0])
@@ -383,7 +400,7 @@ def history(self, id):
                 )
             feed.content_type = 'application/atom+xml'
             return feed.writeString('utf-8')
-        return render('group/history.html')
+        return render( self._history_template(c.group_dict['type']) )
 
     def _render_edit_form(self, fs):
         # errors arrive in c.error and fs.errors