Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Columns plugin #1472

Closed
wants to merge 26 commits into
from

Conversation

Projects
None yet
5 participants
Member

digi604 commented Oct 11, 2012

Enables plugins in plugins.

yakky and others added some commits Sep 19, 2012

Member

digi604 commented Oct 11, 2012

docs missing, cleanup, tests?

ojii and others added some commits Oct 11, 2012

Saner defaults for plugins
* Fixes #1373.
* The default name for plugins is now nicer.
* The render method of plugins now by default adds.
  the instance and placeholder to the context and
  returns it, eliminating the need to overwrite this
  method in simple plugins.
Migrations rewritten: all migrations has been created from scratch us…
…ing using South==0.7.5 and saved as 0001_initial; all others are empty just to keep migration history consistent
Merge branch 'feature/migrations_history_rewrite' of github.com:yakky…
…/django-cms into feature/migrations_history_rewrite
fixed the inherit plugin so that it does not explode when trying to r…
…ender an "empty" plugin

"empty" means in this case a plugin that has a ``CMSPlugin`` instance, but no subclass instance, despite having a ``plugin_type`` other than ``CMSPluginBase``. Such plugins can come into existence e.g. when the user starts creating a plugin, but cancels the creation of the plugin.
Merge pull request #1482 from piquadrat/feature/fix-inherit-empty-plugin
fixed the inherit plugin so that it does not explode when trying to render an "empty" plugin
Merge pull request #1483 from tomscytale/develop
Develop: Django 1.5 compatibility - remove simple_class_factory and verify_exists

@beniwohli beniwohli commented on an outdated diff Oct 19, 2012

cms/models/pluginmodel.py
@@ -87,6 +87,7 @@ class CMSPlugin(MPTTModel):
lft = models.PositiveIntegerField(db_index=True, editable=False)
rght = models.PositiveIntegerField(db_index=True, editable=False)
tree_id = models.PositiveIntegerField(db_index=True, editable=False)
+ childrens = None
@beniwohli

beniwohli Oct 19, 2012

Contributor

tbh, I'd prefer the verbosity of something like "child_plugins" to the orthographical wrongness of "childrens"

Merge branch 'develop' into columns-plugin
Conflicts:
	docs/upgrade/2.4.rst

@digi604 digi604 closed this Oct 19, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment