merge

--HG--
emptychangelog : true

Author: Patrick Lauber

cms/models/__init__.py

@@ -2,4 +2,4 @@
 from pagemodel import *
 from permissionmodels import *
 from pluginmodel import *
-from titlemodels import *
+from titlemodels import *

cms/models/managers.py

@@ -93,9 +93,7 @@ def get_home(self, site=None):
     def search(self, q, language=None, current_site_only=True):
         """Simple search function
         
-        NOTE:For future may be better if every plugin defines Q object relative 
-        to page, and search function just takes them. This will give us 
-        posibillity to search over custom plugins. 
+        Plugins can define a 'search_fields' tuple similar to ModelAdmin classes
         """
         qs = self.public()
 
@@ -105,20 +103,15 @@ def search(self, q, language=None, current_site_only=True):
 
         qt = Q(title_set__title__icontains=q)
 
-        plugins = (
-            ('cms.plugins.text', Q(cmsplugin__text__body__icontains=q)),
-            ('cms.plugins.file', Q(cmsplugin__file__title__icontains=q)),
-            ('cms.plugins.snippet', Q(cmsplugin__snippetptr__snippet__html__icontains=q)),
-            ('cms.plugins.link', Q(cmsplugin__link__name__icontains=q)),
-            ('cms.plugins.teaser', Q(cmsplugin__teaser__description__icontains=q)),
-        )
-        
+        # find 'searchable' plugins and build query
         qp = Q()
-        # build plugin query depending on installed plugins
-        for app_name, q in plugins:
-            if not app_name in settings.INSTALLED_APPS:
-                continue
-            qp |= q
+        # cannot import CMSPlugin due to Manager -> Page -> Plugin circle!
+        CMSPlugin = models.get_model('cms','cmsplugin')
+        for c in CMSPlugin.__subclasses__():
+            if hasattr(c, 'search_fields'):
+                for field in c.search_fields:
+                    qp |= Q(**{'cmsplugin__%s__%s__icontains' % \
+                                   (c.__name__.lower(), field):q})
 
         if language:
             qt &= Q(title_set__language=language)
@@ -129,7 +122,6 @@ def search(self, q, language=None, current_site_only=True):
         return qs.distinct()
 
 
-        
 class TitleManager(PublisherManager):
     def get_title(self, page, language, language_fallback=False, latest_by='creation_date'):
         """
@@ -466,4 +458,4 @@ def __get_id_list(self, user, attr):
 class PageModeratorStateManager(models.Manager):
     def get_delete_actions(self):
         from cms.models import PageModeratorState
-        return self.filter(action=PageModeratorState.ACTION_DELETE)
+        return self.filter(action=PageModeratorState.ACTION_DELETE)

cms/plugin_base.py

@@ -28,6 +28,26 @@ class Meta:
                         exclude = ('page', 'position', 'placeholder', 'language', 'plugin_type')
                 self.form = DefaultModelForm
 
+            # Move 'advanced' fields into separate fieldset.
+            # Currently disabled if fieldsets already set, though
+            # could simply append an additional 'advanced' fieldset -- 
+            # but then the plugin can't customise the advanced fields
+            if not self.__class__.fieldsets:
+                basic_fields = []
+                advanced_fields = []
+                for f in self.model._meta.fields:
+                    if not f.auto_created and f.editable:
+                        if hasattr(f,'advanced'): 
+                            advanced_fields.append(f.name)
+                        else: basic_fields.append(f.name)
+                if advanced_fields: # leave well enough alone otherwise
+                    self.__class__.fieldsets = (
+                        (None, { 'fields' : basic_fields}),
+                        (_('Advanced options'), 
+                         {'fields' : advanced_fields, 
+                          'classes' : ('collapse',)})
+                        )
+
         if admin_site:
             super(CMSPluginBase, self).__init__(self.model, admin_site)
 
@@ -126,4 +146,4 @@ def __repr__(self):
         return smart_str(self.name)
 
     def __unicode__(self):
-        return self.name
+        return self.name

cms/plugins/file/models.py

@@ -1,9 +1,8 @@
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from cms.models import CMSPlugin
 from posixpath import join, basename, splitext, exists
-
+from django.db.models import Q
 from cms import settings as cms_settings
 from django.conf import settings
 
@@ -55,4 +54,5 @@ def __unicode__(self):
             # added if, because it raised attribute error when file wasnt defined
             return self.get_file_name();
         return "<empty>"
-        
+
+    search_fields = ('title',)

cms/plugins/file/templates/cms/plugins/file.html

@@ -5,5 +5,3 @@
 {% if object.title %}{{ object.title }}{% else %}{{ object.get_file_name }}{% endif %} {% if object.file_exists %}<span class="filesize">({{ object.file.size|filesizeformat }})</span>{% else %}(file missing!){% endif %}</a>
 </span>
 {% endif %}
-
-

cms/plugins/link/models.py

@@ -2,6 +2,7 @@
 from django.utils.translation import ugettext_lazy as _
 from cms.models import CMSPlugin, Page
 from django.conf import settings
+from django.db.models import Q
 
 class Link(CMSPlugin):
     """
@@ -15,3 +16,5 @@ class Link(CMSPlugin):
 
     def __unicode__(self):
         return self.name
+
+    search_fields = ('name',)

cms/plugins/snippet/models.py

@@ -3,6 +3,7 @@
 from cms.models import CMSPlugin
 from django.conf import settings
 from cms.utils.helpers import reversion_register
+from django.db.models import Q
 
 # Stores the actual data
 class Snippet(models.Model):
@@ -29,6 +30,8 @@ class SnippetPtr(CMSPlugin):
     class Meta:
         verbose_name = _("Snippet")
 
+    search_fields = ('snippet__html',)
+
 # We don't both with SnippetPtr, since all the data is actually in Snippet
 reversion_register(Snippet)
 

cms/plugins/teaser/models.py

@@ -1,9 +1,8 @@
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from cms.models import CMSPlugin, Page
 from os.path import basename
-
+from django.db.models import Q
 from django.conf import settings
 
 class Teaser(CMSPlugin):
@@ -19,3 +18,4 @@ class Teaser(CMSPlugin):
     def __unicode__(self):
         return self.title
 
+    search_fields = ('description',)

cms/plugins/text/models.py

@@ -6,6 +6,7 @@
 from django.utils.text import truncate_words
 from cms.plugins.text.utils import plugin_admin_html_to_tags,\
     plugin_tags_to_admin_html
+from django.db.models import Q
 
 class Text(CMSPlugin):
     """A block of content, tied to a page, for a particular language"""
@@ -24,6 +25,7 @@ def _get_body_admin(self):
                               admin. Read/write.
                               """)
 
+    search_fields = ('body',)
 
     def __unicode__(self):
         return u"%s" % (truncate_words(strip_tags(self.body), 3)[:30]+"...")

cms/signals.py

@@ -154,7 +154,7 @@ def post_save_user_group(instance, raw, created, **kwargs):
     # TODO: same as in post_save_user - raw sql is just not nice - workaround...?
 
     cursor = connection.cursor()
-    query = "INSERT INTO `%s` (`group_ptr_id`, `created_by_id`) VALUES (%d, %d)" % (
+    query = "INSERT INTO %s (group_ptr_id, created_by_id) VALUES (%d, %d)" % (
         PageUserGroup._meta.db_table,
         instance.pk, 
         creator.pk