Stephen Burrows [Mon, 31 Jan 2011 18:01:03 +0000 (13:01 -0500)]
Clarified error messages and docstrings in models/nodes.py. Removed an extraneous argument to MultiView.urlpatterns.
Stephen Burrows [Mon, 31 Jan 2011 15:06:02 +0000 (10:06 -0500)]
Corrected SlugMultipleChoiceField introspection rule.
Stephen Burrows [Fri, 28 Jan 2011 16:01:36 +0000 (11:01 -0500)]
Merge branch 'master' of github.com/ithinksw/philo
Stephen Burrows [Fri, 28 Jan 2011 14:18:32 +0000 (09:18 -0500)]
Added navigation key to shipherd's has_navigation filter.
Joseph Spiros [Fri, 28 Jan 2011 12:45:12 +0000 (07:45 -0500)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo: (31 commits)
Merged cowell back into core.
Added support for DateTime information being stored in a JSONAttribute. Switched ForeignKeyAttribute and M2MAttribute to store the related model in self.to instead of overwriting self.model.
Initial raw_id_fields support for proxy fields. Involves hacks to bypass model validation for things like raw_id_fields, where validation depends on model._meta.get_field(). Renamed EntityForm to ProxyFieldForm to more accurately reflect its purpose. Removed extraneous code from ProxyFieldForm that didn't belong there.
Ungenericized get_item_queryset and added tag/issue queryset fetching methods to BlogView and NewsletterView, respectively. Re-added the tag_archive_view and issue_archive_view methods and set them up to use these methods.
Added get_item_queryset method to BlogView and NewsletterView so that subclasses can replace this functionality. Moved get_context hook onto the MultiView base class and added a basic_view method which provides a simple way to add a view method to a multiview's urlpatterns for a related View subclass instance.
Added missing import to forms/fields.py
Small tweaks to TreeModel.get_path to take advantage of updates to django-mptt. Updated README accordingly.
Moved container forms and attribute forms into admin. Moved AttributeFields and EntityForm into contrib/cowell/; this more accurately reflects their status as convenient in certain circumstances. Simplified imports according to these changes. Made further tweaks to ManyToManyValue's methods.
Split forms into containers, entities, and fields. Split attribute fields out from other model fields. Revamped the interaction between AttributeForm and the AttributeValue subclasses to more clearly define their roles. Moved all code related to AttributeFields into models.fields.attributes. Genericized AttributeFieldDescriptor and removed the other descriptor options.
Minor correction to NavigationManager caching.
Reduced number of queries for BlogView.get_entries_by_tag. Corrected waldo's AccountMultiView.has_valid_account() method, which had holdovers from the user_form/profile_form distinction.
Improved blog and newsletter ModelAdmins. Set BlogEntries and NewsletterArticlesup to set their dates on save if it wasn't set manually - gives more accurate publishing times than a datetime.now() default. Set feed creation to use templates for title and description so that projects can customize the display for markdown etc. Limited Attribute.key to word characters to ensure template usability. Ordered Tags by name.
Added a Navigation model to mediate between Nodes and multiple sets of navigation. Updated templatetags accordingly. Addresses issue 70.
Added fix_init_kwarg method to JSONField and connected it to the pre_init signal during contribute_to_class - this effectively mimics what django does for RelatedObject fields in Model.__init__ by allowing a python value to be passed in to the constructor (e.g. JSONValue(value={}) instead of JSONValue(value_json='{}')). This resolves issue 68.
Split shipherd NodeNavigationInline into inlines for hosted/targeting inlines. Added NodeAdmin reregistration to bring the new inlines into play. Added navigation_host filter.
Minor correction to Navigation.is_active()
updated grappelli_tabular_attribute.html to match changes in grappelli 2.3
Shifted NavigationManager caching to use node instances rather than node pks. Improved (i.e. added) a distinction between having a cache for a node and having a Navigation instance somewhere in the cache. Refactored Navigation.is_active for better clarity. Added cache clearing for previously-uncached, directly-hosted navigation. Adjusted recursenavigation to accept either a node or a queryset/iterable. Added targeting_navigation filter.
Added shortcut is_cached method to Navigation instances and Navigation.objects; updated other methods to use these shortcuts. Added cache clearing for new and changed Navigation instances that have not been cached but are within the range of a hosted navigation instance.
Corrected shipherd Navigation cache clearing and made grappelli attribute inline template compatible with grappelli r1399. Tweaked recursenavigation template tag behavior to set {{ navigation }} in the context instead of node and corrected its documentation. Added has_navigation filter.
...
Stephen Burrows [Thu, 27 Jan 2011 21:28:09 +0000 (16:28 -0500)]
Merge branch 'entity_raw_id_fields'
Stephen Burrows [Thu, 27 Jan 2011 21:27:48 +0000 (16:27 -0500)]
Merged cowell back into core.
Stephen Burrows [Thu, 27 Jan 2011 19:50:12 +0000 (14:50 -0500)]
Initial sobol commit. Provides "magic search" functionality for philo. This includes a search definition/registration API and the intent for delayed loading of search results with ajax (though this is not yet implemented.)
Stephen Burrows [Tue, 25 Jan 2011 16:15:06 +0000 (11:15 -0500)]
Added support for DateTime information being stored in a JSONAttribute. Switched ForeignKeyAttribute and M2MAttribute to store the related model in self.to instead of overwriting self.model.
Stephen Burrows [Mon, 24 Jan 2011 18:37:48 +0000 (13:37 -0500)]
Initial raw_id_fields support for proxy fields. Involves hacks to bypass model validation for things like raw_id_fields, where validation depends on model._meta.get_field(). Renamed EntityForm to ProxyFieldForm to more accurately reflect its purpose. Removed extraneous code from ProxyFieldForm that didn't belong there.
Stephen Burrows [Tue, 25 Jan 2011 21:33:00 +0000 (16:33 -0500)]
Ungenericized get_item_queryset and added tag/issue queryset fetching methods to BlogView and NewsletterView, respectively. Re-added the tag_archive_view and issue_archive_view methods and set them up to use these methods.
Stephen Burrows [Tue, 25 Jan 2011 20:40:12 +0000 (15:40 -0500)]
Added get_item_queryset method to BlogView and NewsletterView so that subclasses can replace this functionality. Moved get_context hook onto the MultiView base class and added a basic_view method which provides a simple way to add a view method to a multiview's urlpatterns for a related View subclass instance.
Stephen Burrows [Sun, 23 Jan 2011 21:15:04 +0000 (16:15 -0500)]
Added missing import to forms/fields.py
Stephen Burrows [Tue, 4 Jan 2011 18:16:57 +0000 (13:16 -0500)]
Small tweaks to TreeModel.get_path to take advantage of updates to django-mptt. Updated README accordingly.
Stephen Burrows [Fri, 21 Jan 2011 22:15:54 +0000 (17:15 -0500)]
Merge branch 'entity_raw_id_fields'
Stephen Burrows [Fri, 21 Jan 2011 22:09:26 +0000 (17:09 -0500)]
Moved container forms and attribute forms into admin. Moved AttributeFields and EntityForm into contrib/cowell/; this more accurately reflects their status as convenient in certain circumstances. Simplified imports according to these changes. Made further tweaks to ManyToManyValue's methods.
Stephen Burrows [Fri, 21 Jan 2011 18:09:58 +0000 (13:09 -0500)]
Split forms into containers, entities, and fields. Split attribute fields out from other model fields. Revamped the interaction between AttributeForm and the AttributeValue subclasses to more clearly define their roles. Moved all code related to AttributeFields into models.fields.attributes. Genericized AttributeFieldDescriptor and removed the other descriptor options.
Stephen Burrows [Fri, 21 Jan 2011 05:49:47 +0000 (00:49 -0500)]
Minor correction to NavigationManager caching.
Stephen Burrows [Thu, 20 Jan 2011 14:37:31 +0000 (09:37 -0500)]
Reduced number of queries for BlogView.get_entries_by_tag. Corrected waldo's AccountMultiView.has_valid_account() method, which had holdovers from the user_form/profile_form distinction.
Stephen Burrows [Wed, 19 Jan 2011 18:36:21 +0000 (13:36 -0500)]
Improved blog and newsletter ModelAdmins. Set BlogEntries and NewsletterArticlesup to set their dates on save if it wasn't set manually - gives more accurate publishing times than a datetime.now() default. Set feed creation to use templates for title and description so that projects can customize the display for markdown etc. Limited Attribute.key to word characters to ensure template usability. Ordered Tags by name.
Stephen Burrows [Tue, 18 Jan 2011 22:35:05 +0000 (17:35 -0500)]
Added a Navigation model to mediate between Nodes and multiple sets of navigation. Updated templatetags accordingly. Addresses issue 70.
Stephen Burrows [Fri, 14 Jan 2011 19:58:53 +0000 (14:58 -0500)]
Added fix_init_kwarg method to JSONField and connected it to the pre_init signal during contribute_to_class - this effectively mimics what django does for RelatedObject fields in Model.__init__ by allowing a python value to be passed in to the constructor (e.g. JSONValue(value={}) instead of JSONValue(value_json='{}')). This resolves issue 68.
Stephen Burrows [Fri, 14 Jan 2011 17:02:03 +0000 (12:02 -0500)]
Split shipherd NodeNavigationInline into inlines for hosted/targeting inlines. Added NodeAdmin reregistration to bring the new inlines into play. Added navigation_host filter.
Stephen Burrows [Fri, 14 Jan 2011 15:08:12 +0000 (10:08 -0500)]
Minor correction to Navigation.is_active()
Stephen Burrows [Fri, 14 Jan 2011 04:24:15 +0000 (23:24 -0500)]
updated grappelli_tabular_attribute.html to match changes in grappelli 2.3
Stephen Burrows [Wed, 12 Jan 2011 18:15:39 +0000 (13:15 -0500)]
Shifted NavigationManager caching to use node instances rather than node pks. Improved (i.e. added) a distinction between having a cache for a node and having a Navigation instance somewhere in the cache. Refactored Navigation.is_active for better clarity. Added cache clearing for previously-uncached, directly-hosted navigation. Adjusted recursenavigation to accept either a node or a queryset/iterable. Added targeting_navigation filter.
Stephen Burrows [Tue, 11 Jan 2011 20:26:39 +0000 (15:26 -0500)]
Added shortcut is_cached method to Navigation instances and Navigation.objects; updated other methods to use these shortcuts. Added cache clearing for new and changed Navigation instances that have not been cached but are within the range of a hosted navigation instance.
Stephen Burrows [Tue, 11 Jan 2011 14:13:54 +0000 (09:13 -0500)]
Corrected shipherd Navigation cache clearing and made grappelli attribute inline template compatible with grappelli r1399. Tweaked recursenavigation template tag behavior to set {{ navigation }} in the context instead of node and corrected its documentation. Added has_navigation filter.
Stephen Burrows [Mon, 10 Jan 2011 16:08:45 +0000 (11:08 -0500)]
Merge branch 'navigation'
Stephen Burrows [Mon, 10 Jan 2011 16:03:40 +0000 (11:03 -0500)]
Renamed navigation to shipherd.
Stephen Burrows [Mon, 10 Jan 2011 15:24:15 +0000 (10:24 -0500)]
Improved NewsletterArticleAdmin. Corrected embed templatetag errors related to ConstantEmbedNode.object_pk and the parse_content_type helper function (formerly get_content_type).
Kriti Godey [Sun, 9 Jan 2011 22:55:18 +0000 (17:55 -0500)]
Changed Location & Calendar to check for constants in the settings file for which model to use, and made given models the default ones (only to be initialised if no other models are defined.)
Kriti Godey [Sun, 9 Jan 2011 22:09:12 +0000 (17:09 -0500)]
Initial model classes written. Still a few additions needed.
Kriti Godey [Sun, 9 Jan 2011 20:57:31 +0000 (15:57 -0500)]
Initialised empty app julian.
Joseph Spiros [Thu, 6 Jan 2011 19:23:19 +0000 (14:23 -0500)]
Modified the feed behavior for blogs and newsletters to always use the full content of entries and articles.
I am of the opinion that people using feed readers should not have to click through to the website to read the full text of either.
Joseph Spiros [Thu, 6 Jan 2011 19:15:09 +0000 (14:15 -0500)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Added markdown-formatted README, and added a note to the readme re: the IRC channel. Removed the replace_sender_response function as it was a terrible abomination that was bound to encourage hackish solutions.
Improved NodeAdmin list_display options. Added use of default validators to JSONField and JSONFormField.
Simplified waldo's AccountMultiView to rely just on an AccountForm rather than a complicated mix of a UserForm and an AccountForm generated based on a number of attributes.
Minor correction to TreeModel.get_path to allow for subclasses that use an alternate level attribute. Minor correction to TreeManager.get_with_path to only return root as the deepest node if there is actually no deepest_found node. Added MultiView.reverse() shortcut method to handle the common pattern of getting the absolute url for the subpath of a multiview. Adjusted waldo MultiViews to use their reverse() method. Added make_confirmation_link() method to LoginMultiView to provide a standard, reusable way to handle this task. Brought waldo's multiview get_context method use in line with penfield by removing the optional extra dictionary passed in.
Minor correction to embed template tag: updating the context adds an additional context layer, which means the explicitly pushed layer was never popped.
Minor changes to penfield to return feed urls only when feeds are actually enabled and to allow BlogEntry.objects.latest(). Corrected TreeManager.get_with_path to return the root node (if defined) as the deepest node if nothing else is found along the path. Removed embed tag error raising for an expected behavior.
Minor corrections to node_url and embed templatetags to avoid raising unnecessary errors.
Corrected embed handling to ignore embedded instances which do not appear in the context.
Further polished embedding system - allowed for context-dependent embed nodes to be correctly added to the embed context and to correctly render in extending templates even if not within blocks. Added notes to README about how to use philo. Fixed docstring typo for {% node_url %} templatetag.
Improved the initial mptt migration by adding automated tree rebuilds.
Stephen Burrows [Wed, 5 Jan 2011 21:18:32 +0000 (16:18 -0500)]
Added markdown-formatted README, and added a note to the readme re: the IRC channel. Removed the replace_sender_response function as it was a terrible abomination that was bound to encourage hackish solutions.
Stephen Burrows [Tue, 4 Jan 2011 16:36:06 +0000 (11:36 -0500)]
Added a custom QuerySet subclass to handle cache clearing for Navigation mass updates and deletions.
Stephen Burrows [Mon, 3 Jan 2011 22:18:35 +0000 (17:18 -0500)]
Added is_active method to Navigation class. Replaced the get_navigation and is_active filters with a recursenavigation template tag.
Stephen Burrows [Thu, 23 Dec 2010 20:35:32 +0000 (15:35 -0500)]
Switched nav caching to cache the entire set of nodes for the navigation, not just the roots. Tweaked NavigationManager.clear_cache method to accout for this. Set Navigation model save and delete methods to call the cache clearer if appropriate. Tweaked get_navigation filter to take advantage of the changes.
Stephen Burrows [Thu, 23 Dec 2010 17:08:34 +0000 (12:08 -0500)]
Merge branch 'master' into navigation
Stephen Burrows [Thu, 23 Dec 2010 17:07:48 +0000 (12:07 -0500)]
Improved NodeAdmin list_display options. Added use of default validators to JSONField and JSONFormField.
Stephen Burrows [Thu, 23 Dec 2010 17:04:11 +0000 (12:04 -0500)]
Moved NavigationManager cache handling into custom methods for better readability and compartmentalization. Added NavigationManager to Navigation model. Tweaked navigation generation filter to work based on a Node instead of roots.
Stephen Burrows [Thu, 23 Dec 2010 15:19:08 +0000 (10:19 -0500)]
Tweaked admin and models. Added filters to manage navigation display.
Stephen Burrows [Tue, 21 Dec 2010 22:36:36 +0000 (17:36 -0500)]
Moved all navigation-related code to contrib/navigation. Refactored navigation to be more independant of the Node tree structure and allow for absolute urls, links to nodes, links to node subpaths, and links to reversed node subpaths.
Stephen Burrows [Tue, 21 Dec 2010 15:12:03 +0000 (10:12 -0500)]
Merge branch 'master' into navigation
Stephen Burrows [Mon, 20 Dec 2010 21:56:43 +0000 (16:56 -0500)]
Simplified waldo's AccountMultiView to rely just on an AccountForm rather than a complicated mix of a UserForm and an AccountForm generated based on a number of attributes.
Stephen Burrows [Mon, 20 Dec 2010 19:24:04 +0000 (14:24 -0500)]
Minor correction to TreeModel.get_path to allow for subclasses that use an alternate level attribute. Minor correction to TreeManager.get_with_path to only return root as the deepest node if there is actually no deepest_found node. Added MultiView.reverse() shortcut method to handle the common pattern of getting the absolute url for the subpath of a multiview. Adjusted waldo MultiViews to use their reverse() method. Added make_confirmation_link() method to LoginMultiView to provide a standard, reusable way to handle this task. Brought waldo's multiview get_context method use in line with penfield by removing the optional extra dictionary passed in.
Stephen Burrows [Thu, 16 Dec 2010 21:59:02 +0000 (16:59 -0500)]
Minor correction to embed template tag: updating the context adds an additional context layer, which means the explicitly pushed layer was never popped.
Stephen Burrows [Wed, 15 Dec 2010 17:59:57 +0000 (12:59 -0500)]
Minor changes to penfield to return feed urls only when feeds are actually enabled and to allow BlogEntry.objects.latest(). Corrected TreeManager.get_with_path to return the root node (if defined) as the deepest node if nothing else is found along the path. Removed embed tag error raising for an expected behavior.
Stephen Burrows [Wed, 8 Dec 2010 19:47:13 +0000 (14:47 -0500)]
Minor corrections to node_url and embed templatetags to avoid raising unnecessary errors.
Stephen Burrows [Wed, 1 Dec 2010 21:49:35 +0000 (16:49 -0500)]
Corrected embed handling to ignore embedded instances which do not appear in the context.
Stephen Burrows [Tue, 30 Nov 2010 15:35:42 +0000 (10:35 -0500)]
Further polished embedding system - allowed for context-dependent embed nodes to be correctly added to the embed context and to correctly render in extending templates even if not within blocks. Added notes to README about how to use philo. Fixed docstring typo for {% node_url %} templatetag.
Stephen Burrows [Mon, 29 Nov 2010 16:06:57 +0000 (11:06 -0500)]
Improved the initial mptt migration by adding automated tree rebuilds.
Joseph Spiros [Mon, 29 Nov 2010 19:11:37 +0000 (14:11 -0500)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Added {% include_string %} tag to allow passing of context from templates to template code from arbitrary sources (such as a NewsletterArticle).
Added get_path tests back in. Special-cased get_path if root and self are equal to return '' instead of raising an exception.
Corrected Node's get_path method to only fetch the path since the given root (if any)
Brought tests in line with mptt branch. Added assertQueryLimit method as a rough measure of efficiency. Added get_with_path tests. Made corrections to get_with_path for cases where root != None.
Added {% embed <instance> %} syntax for embedding. Switched to actually using the EmbedNode get_instance and get_template methods for greater flexibility.
Added MPTTModelAdmin integration. Committed docstring changes for get_with_path.
Initial mptt commit. Implements a much more efficient get_with_path method for TreeManager, optimized with mptt features. Also increases efficiency of TreeModel.get_path(). mptt admin features to come.
Stephen Burrows [Mon, 29 Nov 2010 15:59:21 +0000 (10:59 -0500)]
Added NodeOverrideInlineFormSet to clean up admin editing of node overrides by only displaying overrides where both the override's parent and the override's child__parent are the current instance. Cleaned up migrations by merging the change of NodeNavigationOverride.parent to allow null into the original migration that created NodeNavigationOverrides. Made navigation include the root node in the top-level navigation... not sure this is the correct way to handle things. Added navigation-generating template tag.
Stephen Burrows [Tue, 16 Nov 2010 16:39:05 +0000 (11:39 -0500)]
Minor improvements to navigationoverrides, including admin support and working navigation construction.
Stephen Burrows [Thu, 11 Nov 2010 18:26:41 +0000 (13:26 -0500)]
Initial navigation commit. Steps towards Model-managed navigation overrides.
Stephen Burrows [Mon, 29 Nov 2010 18:32:20 +0000 (13:32 -0500)]
Merge branch 'feature/include_string_tag'
Stephen Burrows [Wed, 17 Nov 2010 18:51:13 +0000 (13:51 -0500)]
Added {% include_string %} tag to allow passing of context from templates to template code from arbitrary sources (such as a NewsletterArticle).
Stephen Burrows [Mon, 29 Nov 2010 18:25:19 +0000 (13:25 -0500)]
Merge branch 'mptt'
Conflicts:
tests.py
Stephen Burrows [Mon, 22 Nov 2010 15:45:31 +0000 (10:45 -0500)]
Added get_path tests back in. Special-cased get_path if root and self are equal to return '' instead of raising an exception.
Stephen Burrows [Fri, 19 Nov 2010 06:46:38 +0000 (01:46 -0500)]
Corrected Node's get_path method to only fetch the path since the given root (if any)
Stephen Burrows [Tue, 16 Nov 2010 21:00:07 +0000 (16:00 -0500)]
Brought tests in line with mptt branch. Added assertQueryLimit method as a rough measure of efficiency. Added get_with_path tests. Made corrections to get_with_path for cases where root != None.
Stephen Burrows [Mon, 29 Nov 2010 17:26:41 +0000 (12:26 -0500)]
Added {% embed <instance> %} syntax for embedding. Switched to actually using the EmbedNode get_instance and get_template methods for greater flexibility.
Joseph Spiros [Wed, 24 Nov 2010 02:28:28 +0000 (21:28 -0500)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Enabled Embed rule inheritance from parent templates and to included templates with a bit of overriding of EmbedNode methods and use of context.render_context similar to BlockNodes. Removed {% embed as <varname> %} syntax as obsolete. Added tests for {% embed %} tags in various situations.
Switched template loading from Template.loader to philo.loaders.database.Loader in keeping with Django's recommended way of implementing loaders. Note that the origin of the template is considered to be the actual instance instead of a path, as this seems more strictly accurate. The instance is converted to unicode by the loader to more correctly fit the expected "display_name". Removed origin and django_template properties from templates. Corrected a minor error in the node_url templatetag for contexts not containing 'node'.
Switched node_view conditions for raising MIDDLEWARE_NOT_CONFIGURED to actually check whether the middleware is configured. This allows errors in request.node evaluation to propogate and be more easily debugged.
Added get_branch support to TreeManager.
Added support for recursive trees - i.e. recursion checks to prevent infinite loops. Improved efficiency of TreeModel.get_path method by removing has_ancestor check. Shortened and clarified NodeURLTestCase; added test case for TreeModel paths and ancestor checks.
Increased specificity of penfield get_article conditions for 404 raising. Corrected get_with_path handling of trailing pathseps to re-add them to the path's remainder.
Customized FilterSelectMultiple widget for Tags to allow one-click adding of tags not found with normal filtering. Addresses feature #9 for the built-in admin interface.
Improved general efficiency of TreeManager's get_with_path method in terms of number of queries by implementing a halving algorithm. Can require more queries than the previous algorithm in cases where the remainder following the deepest node is relatively long.
Shunted responsibility for 404 and 500 error catching from node_view to RequestNodeMiddleware. Made minor corrections to ManyToMany values and descriptors.
Minor correction to Waldo logout view to fall back to the node's absolute_url if HTTP_REFERER is not found in request.META
Tweaked Entity and TreeEntity to pass an actual queryset to QuerySetMapper instead of a manager. The results are generally the same, and anyone accessing querysetmapper.queryset will be expecting to find a queryset.
Switched Attribute ManyToManyValues to have a ManyToManyField to ForeignKeyValues instead of a CommaSeparatedIntegerField. This allows joined queries and referential integrity. In the long run, it also simplifies adding support for non-integer primary keys.
Cleaned up ManyToManyValue set_value method. Also tweaked container template tag to recognize a contentlet as dynamic if it only contains a variable.
Stephen Burrows [Fri, 19 Nov 2010 20:06:19 +0000 (15:06 -0500)]
Enabled Embed rule inheritance from parent templates and to included templates with a bit of overriding of EmbedNode methods and use of context.render_context similar to BlockNodes. Removed {% embed as <varname> %} syntax as obsolete. Added tests for {% embed %} tags in various situations.
Stephen Burrows [Wed, 17 Nov 2010 16:05:28 +0000 (11:05 -0500)]
Switched template loading from Template.loader to philo.loaders.database.Loader in keeping with Django's recommended way of implementing loaders. Note that the origin of the template is considered to be the actual instance instead of a path, as this seems more strictly accurate. The instance is converted to unicode by the loader to more correctly fit the expected "display_name". Removed origin and django_template properties from templates. Corrected a minor error in the node_url templatetag for contexts not containing 'node'.
Stephen Burrows [Tue, 16 Nov 2010 16:49:09 +0000 (11:49 -0500)]
Switched node_view conditions for raising MIDDLEWARE_NOT_CONFIGURED to actually check whether the middleware is configured. This allows errors in request.node evaluation to propogate and be more easily debugged.
Stephen Burrows [Mon, 15 Nov 2010 16:39:46 +0000 (11:39 -0500)]
Added MPTTModelAdmin integration. Committed docstring changes for get_with_path.
Stephen Burrows [Fri, 12 Nov 2010 19:10:01 +0000 (14:10 -0500)]
Initial mptt commit. Implements a much more efficient get_with_path method for TreeManager, optimized with mptt features. Also increases efficiency of TreeModel.get_path(). mptt admin features to come.
Stephen Burrows [Wed, 10 Nov 2010 19:07:42 +0000 (14:07 -0500)]
Added get_branch support to TreeManager.
Stephen Burrows [Wed, 10 Nov 2010 16:10:53 +0000 (11:10 -0500)]
Added support for recursive trees - i.e. recursion checks to prevent infinite loops. Improved efficiency of TreeModel.get_path method by removing has_ancestor check. Shortened and clarified NodeURLTestCase; added test case for TreeModel paths and ancestor checks.
Stephen Burrows [Fri, 5 Nov 2010 21:19:00 +0000 (17:19 -0400)]
Increased specificity of penfield get_article conditions for 404 raising. Corrected get_with_path handling of trailing pathseps to re-add them to the path's remainder.
Stephen Burrows [Fri, 5 Nov 2010 19:07:29 +0000 (15:07 -0400)]
Customized FilterSelectMultiple widget for Tags to allow one-click adding of tags not found with normal filtering. Addresses feature #9 for the built-in admin interface.
Stephen Burrows [Thu, 4 Nov 2010 18:59:20 +0000 (14:59 -0400)]
Improved general efficiency of TreeManager's get_with_path method in terms of number of queries by implementing a halving algorithm. Can require more queries than the previous algorithm in cases where the remainder following the deepest node is relatively long.
Stephen Burrows [Tue, 2 Nov 2010 20:37:35 +0000 (16:37 -0400)]
Shunted responsibility for 404 and 500 error catching from node_view to RequestNodeMiddleware. Made minor corrections to ManyToMany values and descriptors.
Stephen Burrows [Mon, 1 Nov 2010 15:25:15 +0000 (11:25 -0400)]
Merge branch 'bugfix/waldo_logout_view'
Stephen Burrows [Mon, 1 Nov 2010 15:05:52 +0000 (11:05 -0400)]
Minor correction to Waldo logout view to fall back to the node's absolute_url if HTTP_REFERER is not found in request.META
Stephen Burrows [Fri, 29 Oct 2010 21:03:14 +0000 (17:03 -0400)]
Tweaked Entity and TreeEntity to pass an actual queryset to QuerySetMapper instead of a manager. The results are generally the same, and anyone accessing querysetmapper.queryset will be expecting to find a queryset.
Stephen Burrows [Fri, 29 Oct 2010 14:46:35 +0000 (10:46 -0400)]
Switched Attribute ManyToManyValues to have a ManyToManyField to ForeignKeyValues instead of a CommaSeparatedIntegerField. This allows joined queries and referential integrity. In the long run, it also simplifies adding support for non-integer primary keys.
Stephen Burrows [Thu, 28 Oct 2010 18:38:34 +0000 (14:38 -0400)]
Cleaned up ManyToManyValue set_value method. Also tweaked container template tag to recognize a contentlet as dynamic if it only contains a variable.
Joseph Spiros [Wed, 27 Oct 2010 17:36:10 +0000 (10:36 -0700)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Added grappelli inlines for contentlets and attributes which become active if grappelli is installed.
Corrected NewsletterView add_item method to join a list of author full_names instead of a QuerySet of models.
Bugfix: corrects erratic TreeModel get_path behavior. Was returning an extra slash at the end of paths with a given root.
Moved get_subpath and get_reverse_params prototypes into View model.
Stephen Burrows [Tue, 26 Oct 2010 13:50:51 +0000 (09:50 -0400)]
Added grappelli inlines for contentlets and attributes which become active if grappelli is installed.
Stephen Burrows [Fri, 22 Oct 2010 17:59:41 +0000 (13:59 -0400)]
Merge branch 'bugfix/penfield_newsletter_feed'
Stephen Burrows [Fri, 22 Oct 2010 17:59:00 +0000 (13:59 -0400)]
Corrected NewsletterView add_item method to join a list of author full_names instead of a QuerySet of models.
Stephen Burrows [Thu, 21 Oct 2010 21:45:46 +0000 (17:45 -0400)]
Merge branch 'bugfix/get_path_trailing_slash'
Stephen Burrows [Thu, 21 Oct 2010 21:41:19 +0000 (17:41 -0400)]
Bugfix: corrects erratic TreeModel get_path behavior. Was returning an extra slash at the end of paths with a given root.
Stephen Burrows [Thu, 21 Oct 2010 21:38:45 +0000 (17:38 -0400)]
Moved get_subpath and get_reverse_params prototypes into View model.
Joseph Spiros [Thu, 21 Oct 2010 20:22:11 +0000 (16:22 -0400)]
Merge branch '404_relationship_bugfix' of git://github.com/melinath/philo
* '404_relationship_bugfix' of git://github.com/melinath/philo:
Removes leftover references to relationships in nodeview error handling and in TreeEntity
Stephen Burrows [Thu, 21 Oct 2010 20:20:14 +0000 (16:20 -0400)]
Removes leftover references to relationships in nodeview error handling and in TreeEntity
Joseph Spiros [Thu, 21 Oct 2010 19:59:40 +0000 (15:59 -0400)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Added support for 'editable' to ProxyFields. Tweaked AttributeFieldDescriptor base class to not raise an AttributeError on access. This allows the descriptor to be detected by Django admin validation, allowing the proxy fields to be used (for example) in a ModelAdmin's readonly_fields and list_display fields. This may address the remaining issues in feature #16.
Tweaked philo migrations to force contenttype creation after migration 0005 so the contenttypes are available in migration 0006. Ordinarily contenttypes are only synced after a complete set of migrations. Also implemented default values on proxy fields; partially addresses feature #16.
Added unittest for node_url templatetag. Fixed issues uncovered with unittests. Added test fixture. Seems bugfree - as such, addresses feature #12.
Initial node_url_refactor commit. Revises node_url templatetag to accept args/kwargs like urlnode, using the current or given node's view as the urlconf. with <obj> is retained as a convenient shortcut.
Initial node_middleware commit. Implements an attribute on the HttpRequest class which handles lazy node evaluation - i.e. request.node is available for all requests, but is only evaluated on first use. Removed all references I could find to node, path, and subpath in Views, which may make for a simpler API. Path and subpath were generally unused and can be extrapolated in other ways; however, should it come to light that they are necessary, they can be added back in.
Added model validation to Pages; for a page to be valid, its related template must also be valid. Ordinarily, the template would need to be valid in order to exist; however, this should help catch cases where, for example, changes on a filesystem template affect the validity of a database template. Addresses the remaining issues with bug #14.
Genericized penfield's migrations to allow for variations in the PHILO_PERSON_MODULE setting by adding a central frozen reference to the person module appropriate for use in a South Migration.
Tweaked QuerySetMapper to return the value's value, in line with the changes to flexible attributes. Adjusted attribute fields to compensate.
Shunted the responsibility in Entity proxy models for setting an Attribute's value onto the field that manages the model's relationship to that attribute.
Added migrations to handle transfer of structure and information to and from flexible attributes.
Added AttributeInlineFormSet to force new Attribute instances to be run through the form's save method for extra processing.
Added generic relation from attribute values back to Attribute.
Added migrations from ithinksw/master to melinath/master
Added search field to tags; added db_index=True to newsletter article full_text to expediate searching.
Polished AttributeForm to better handle changes to an attribute instance. Introduced apply_data to AttributeValue models to further allow customization. Made an AttributeValue class which must be subclassed to create new attribute values.
Added AttributeForm to elegantly handle all the fields that should be displayed in the admin related to the instance's value. Tweaked the tabular_collapse template (which was only used for attributes) to display the extra fields. Added the "value_formfield" method to Attribute Value models to allow for the possible future addition of value types.
Initial flexible attributes commit. Removed Relationship model in favor of a flexible Attribute model with generic foreign keys to an entity and a value type. This should allow for easy addition of attribute types: for example, an attribute with a ManyToMany value.
Created JSON field, descriptor, and formfield to handle json storage on models uniformly. Addresses feature #26.
Stephen Burrows [Thu, 21 Oct 2010 19:57:01 +0000 (15:57 -0400)]
Merge branch 'node_url_refactor'
Stephen Burrows [Thu, 21 Oct 2010 19:56:45 +0000 (15:56 -0400)]
Merge branch 'node_middleware'
Stephen Burrows [Thu, 21 Oct 2010 19:05:07 +0000 (15:05 -0400)]
Added support for 'editable' to ProxyFields. Tweaked AttributeFieldDescriptor base class to not raise an AttributeError on access. This allows the descriptor to be detected by Django admin validation, allowing the proxy fields to be used (for example) in a ModelAdmin's readonly_fields and list_display fields. This may address the remaining issues in feature #16.
Stephen Burrows [Thu, 21 Oct 2010 16:15:14 +0000 (12:15 -0400)]
Tweaked philo migrations to force contenttype creation after migration 0005 so the contenttypes are available in migration 0006. Ordinarily contenttypes are only synced after a complete set of migrations. Also implemented default values on proxy fields; partially addresses feature #16.
Stephen Burrows [Wed, 20 Oct 2010 21:43:53 +0000 (17:43 -0400)]
Added unittest for node_url templatetag. Fixed issues uncovered with unittests. Added test fixture. Seems bugfree - as such, addresses feature #12.
Stephen Burrows [Wed, 20 Oct 2010 18:45:58 +0000 (14:45 -0400)]
Initial node_url_refactor commit. Revises node_url templatetag to accept args/kwargs like urlnode, using the current or given node's view as the urlconf. with <obj> is retained as a convenient shortcut.
Stephen Burrows [Tue, 19 Oct 2010 21:08:24 +0000 (17:08 -0400)]
Initial node_middleware commit. Implements an attribute on the HttpRequest class which handles lazy node evaluation - i.e. request.node is available for all requests, but is only evaluated on first use. Removed all references I could find to node, path, and subpath in Views, which may make for a simpler API. Path and subpath were generally unused and can be extrapolated in other ways; however, should it come to light that they are necessary, they can be added back in.
Stephen Burrows [Tue, 19 Oct 2010 14:56:15 +0000 (10:56 -0400)]
Merge 'template_error_handling' bugfix.