Joseph Spiros [Mon, 21 Feb 2011 19:17:56 +0000 (14:17 -0500)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Corrected JSONValue.__unicode__ to return unicode instead of bytestrings... not sure what it was being modeled on. Tweaked TargetURLModel to use smart_str instead of str to construct the Python < 2.6.5 kwargs to get a more consistent byte string.
Corrected WaldoAuthenticationForm.clean to handle lack of password/username. Moved password-related forms into a class attribute for customizability. Standardized confirmation email context and allowed for a secure confirmation link.
Tweaked TargetURLModel.get_reverse_params() to convert kwargs keys to bytestrings to support Python versions prior to 2.6.5
Minor correction to BlogView.urlpatterns.
Stephen Burrows [Mon, 21 Feb 2011 18:47:48 +0000 (13:47 -0500)]
Corrected JSONValue.__unicode__ to return unicode instead of bytestrings... not sure what it was being modeled on. Tweaked TargetURLModel to use smart_str instead of str to construct the Python < 2.6.5 kwargs to get a more consistent byte string.
Stephen Burrows [Mon, 21 Feb 2011 15:59:46 +0000 (10:59 -0500)]
Updated node/view documentation.
Stephen Burrows [Mon, 21 Feb 2011 15:03:42 +0000 (10:03 -0500)]
Merge branch 'master' into docs
Stephen Burrows [Mon, 21 Feb 2011 15:00:38 +0000 (10:00 -0500)]
Updated CalendarView urlpatterns to use the new feed_patterns method.
Stephen Burrows [Mon, 21 Feb 2011 14:33:29 +0000 (09:33 -0500)]
Merge branch 'master' into julian
Stephen Burrows [Sun, 20 Feb 2011 19:19:11 +0000 (14:19 -0500)]
Corrected WaldoAuthenticationForm.clean to handle lack of password/username. Moved password-related forms into a class attribute for customizability. Standardized confirmation email context and allowed for a secure confirmation link.
Stephen Burrows [Fri, 18 Feb 2011 19:42:17 +0000 (14:42 -0500)]
Tweaked TargetURLModel.get_reverse_params() to convert kwargs keys to bytestrings to support Python versions prior to 2.6.5
Stephen Burrows [Fri, 18 Feb 2011 18:47:05 +0000 (13:47 -0500)]
Minor correction to BlogView.urlpatterns.
Joseph Spiros [Fri, 18 Feb 2011 15:40:14 +0000 (10:40 -0500)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Switched feed_patterns to return urlpatterns suitable for addition to urlpatterns instead of inclusion in urlpatterns. Adjusted penfield urlpatterns accordingly. Added default behavior for FeedView.get_feed in cases where a known feed_type is not supplied for whatever reason. Added RegistrationMultiView.registration_form attribute.
Switched user authentication in waldo from the login view to an AuthenticationForm for clearer organization of code. Split LoginMultiView into three layered views: LoginMultiView, PasswordMultiView, and RegistrationMultiView, where each layer adds additional (optional) functionality. This structure then naturally includes AccountMultiView as well. Improved redirection for login_required and account_required views.
Corrected penfield BlogView handling of tags, particularly related to feed links. Added an optional slash at the beginning of the feed urlpattern in FeedView.feed_patterns to handle cases where this is included from something with no trailing slash.
Corrected Waldo AccountMultiView typo and improved View error reporting / TargetURL error catching.
Minor tweak to has_navigation filter to silence all errors and return False.
Corrected penfield migration which introduces the feed_type column. Switched NavigationManager.update_targets_for() method to search for node pks instead of doing a JOIN - should be more efficient. Added check for node id before updating the target_node; this was causing an unwanted KeyError in cases where the NavigationItem had no target node.
Stephen Burrows [Thu, 17 Feb 2011 21:57:54 +0000 (16:57 -0500)]
Switched feed_patterns to return urlpatterns suitable for addition to urlpatterns instead of inclusion in urlpatterns. Adjusted penfield urlpatterns accordingly. Added default behavior for FeedView.get_feed in cases where a known feed_type is not supplied for whatever reason. Added RegistrationMultiView.registration_form attribute.
Stephen Burrows [Wed, 16 Feb 2011 19:44:14 +0000 (14:44 -0500)]
Switched user authentication in waldo from the login view to an AuthenticationForm for clearer organization of code. Split LoginMultiView into three layered views: LoginMultiView, PasswordMultiView, and RegistrationMultiView, where each layer adds additional (optional) functionality. This structure then naturally includes AccountMultiView as well. Improved redirection for login_required and account_required views.
Stephen Burrows [Tue, 15 Feb 2011 23:40:50 +0000 (18:40 -0500)]
Added admin sugar for julian models. Corrected minor typos and omissions. Filled out the CalendarView view methods and process_page_items method. Everything seems to work and be stable.
Stephen Burrows [Tue, 15 Feb 2011 23:37:31 +0000 (18:37 -0500)]
Corrected penfield BlogView handling of tags, particularly related to feed links. Added an optional slash at the beginning of the feed urlpattern in FeedView.feed_patterns to handle cases where this is included from something with no trailing slash.
Stephen Burrows [Mon, 14 Feb 2011 23:02:51 +0000 (18:02 -0500)]
Reinstated EventAdmin fieldsets and added some options. Filled out the page requirements, get_reverse_params, urls, and object-fetchers for a CalendarView. Moved header declaration for ICalendarFeed into the feed's write method.
Stephen Burrows [Mon, 14 Feb 2011 19:13:19 +0000 (14:13 -0500)]
Merge branch 'master' into julian
Stephen Burrows [Mon, 14 Feb 2011 19:13:05 +0000 (14:13 -0500)]
Corrected Waldo AccountMultiView typo and improved View error reporting / TargetURL error catching.
Stephen Burrows [Thu, 10 Feb 2011 21:48:48 +0000 (16:48 -0500)]
Initial implementation of a working ICalendarFeedView based on the Django syndication framework and Penfield FeedView.
Stephen Burrows [Thu, 10 Feb 2011 17:29:13 +0000 (12:29 -0500)]
Removed location models and subclass limiting in favor of a ContentTypeRegistryLimiter. Added admins and initial migrations.
Stephen Burrows [Wed, 9 Feb 2011 21:59:20 +0000 (16:59 -0500)]
Minor tweak to has_navigation filter to silence all errors and return False.
Stephen Burrows [Wed, 9 Feb 2011 21:34:58 +0000 (16:34 -0500)]
Corrected penfield migration which introduces the feed_type column. Switched NavigationManager.update_targets_for() method to search for node pks instead of doing a JOIN - should be more efficient. Added check for node id before updating the target_node; this was causing an unwanted KeyError in cases where the NavigationItem had no target node.
Stephen Burrows [Wed, 9 Feb 2011 17:02:57 +0000 (12:02 -0500)]
Removed julian/tests.py and julian/views.py. Switched Location handling from a setting to using a GenericForeignKey to non-abstract Location subclasses.
Joseph Spiros [Wed, 9 Feb 2011 15:35:36 +0000 (10:35 -0500)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Added db_index to Contentlet/ContentReference names, AttributeValue fields, and Navigation keys. Added related_lookup_fields to shipherd admins and corrected its use on NodeAdmin/RedirectAdmin. Corrected TargetURLModel.get_target_url call of get_reverse_params. Corrected typo in BlogView feed creation.
Minor fixes and additions to better_feeds following testing.
Moved FeedMultiViewMixin to models.py and renamed to FeedView. Improved feed type support and clarified the API (based heavily on django.contrib.syndication.views.Feed). Adjusted NewsletterView and BlogView to use the new API.
Stephen Burrows [Wed, 9 Feb 2011 15:30:58 +0000 (10:30 -0500)]
Merge branch 'master' into julian
Stephen Burrows [Wed, 9 Feb 2011 15:16:49 +0000 (10:16 -0500)]
Added db_index to Contentlet/ContentReference names, AttributeValue fields, and Navigation keys. Added related_lookup_fields to shipherd admins and corrected its use on NodeAdmin/RedirectAdmin. Corrected TargetURLModel.get_target_url call of get_reverse_params. Corrected typo in BlogView feed creation.
Stephen Burrows [Tue, 8 Feb 2011 22:10:47 +0000 (17:10 -0500)]
Merge branch 'better_feeds'
Stephen Burrows [Tue, 8 Feb 2011 22:05:29 +0000 (17:05 -0500)]
Minor fixes and additions to better_feeds following testing.
Joseph Spiros [Tue, 8 Feb 2011 00:47:56 +0000 (19:47 -0500)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Added indices to all Attribute fields to improve lookup speed. Added related_lookup_fields to NodeAdmin for grappelli forward-compatibility.
Tweaked LazyNode to handle trailing slashes. Corrected missing import in models/nodes.py.
Corrected shipherd handling of the navigation_items related_name following commit
6ac457d4ac226a474e988dfb898682ae04a86eb0.
Removed trailing_pathsep support from TreeManager.get_with_path. Set nodes to have URLs without a trailing slash, and set node_view to redirect node urls with a trailing slash to the same url, but without the slash. Resolves issue 75 completely.
Added an abstract TargetURLModel to handle issues related to targeting a node, a node's subpaths, a url, or a reversable view. Addresses issue 79 and issue 76.
Minor correction to LazyNode's use of subpath to avoid NameErrors.
Minor cleanup to penfield.utils after get_absolute_url refactor.
Refactored Node.get_absolute_url and related functions (such as MultiView.reverse) to use a new Node.construct_url function, which handles constructing any type of url involving a node or raises an appropriate error if this is not possible. Moved MultiView.reverse to View and merged View.get_subpath into it. Added APPEND_SLASH support to node_view, including support for resolving non-philo targets (resolves issue 75). Made urlpatterns for penfield and waldo MultiViews unambiguous. Altered LazyNode to always return a subpath of at least "/". Added handles_subpath methods to View and MultiView.
Registered Tag as a value model.
Corrected EntityAdminMetaclass handling of inherited vs. declared readonly_fields.
Clarified error messages and docstrings in models/nodes.py. Removed an extraneous argument to MultiView.urlpatterns.
Added navigation key to shipherd's has_navigation filter.
Stephen Burrows [Mon, 7 Feb 2011 20:37:42 +0000 (15:37 -0500)]
Added indices to all Attribute fields to improve lookup speed. Added related_lookup_fields to NodeAdmin for grappelli forward-compatibility.
Stephen Burrows [Mon, 7 Feb 2011 18:10:52 +0000 (13:10 -0500)]
Moved FeedMultiViewMixin to models.py and renamed to FeedView. Improved feed type support and clarified the API (based heavily on django.contrib.syndication.views.Feed). Adjusted NewsletterView and BlogView to use the new API.
Stephen Burrows [Fri, 4 Feb 2011 02:18:08 +0000 (21:18 -0500)]
Tweaked LazyNode to handle trailing slashes. Corrected missing import in models/nodes.py.
Stephen Burrows [Fri, 4 Feb 2011 00:07:52 +0000 (19:07 -0500)]
Corrected shipherd handling of the navigation_items related_name following commit
6ac457d4ac226a474e988dfb898682ae04a86eb0.
Stephen Burrows [Thu, 3 Feb 2011 21:41:01 +0000 (16:41 -0500)]
Removed trailing_pathsep support from TreeManager.get_with_path. Set nodes to have URLs without a trailing slash, and set node_view to redirect node urls with a trailing slash to the same url, but without the slash. Resolves issue 75 completely.
Stephen Burrows [Thu, 3 Feb 2011 16:41:46 +0000 (11:41 -0500)]
Added an abstract TargetURLModel to handle issues related to targeting a node, a node's subpaths, a url, or a reversable view. Addresses issue 79 and issue 76.
Stephen Burrows [Thu, 3 Feb 2011 03:17:25 +0000 (22:17 -0500)]
Minor correction to LazyNode's use of subpath to avoid NameErrors.
Stephen Burrows [Wed, 2 Feb 2011 17:05:11 +0000 (12:05 -0500)]
Minor cleanup to penfield.utils after get_absolute_url refactor.
Stephen Burrows [Wed, 2 Feb 2011 16:48:40 +0000 (11:48 -0500)]
Refactored Node.get_absolute_url and related functions (such as MultiView.reverse) to use a new Node.construct_url function, which handles constructing any type of url involving a node or raises an appropriate error if this is not possible. Moved MultiView.reverse to View and merged View.get_subpath into it. Added APPEND_SLASH support to node_view, including support for resolving non-philo targets (resolves issue 75). Made urlpatterns for penfield and waldo MultiViews unambiguous. Altered LazyNode to always return a subpath of at least "/". Added handles_subpath methods to View and MultiView.
Stephen Burrows [Tue, 1 Feb 2011 17:04:11 +0000 (12:04 -0500)]
Registered Tag as a value model.
Kriti Godey [Tue, 1 Feb 2011 10:04:51 +0000 (05:04 -0500)]
Model changes.
Stephen Burrows [Mon, 31 Jan 2011 21:25:16 +0000 (16:25 -0500)]
Corrected EntityAdminMetaclass handling of inherited vs. declared readonly_fields.
Stephen Burrows [Mon, 31 Jan 2011 17:59:23 +0000 (12:59 -0500)]
Fleshed out the documentation for nodes and views to include all core view subclasses.
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 22:03:05 +0000 (17:03 -0500)]
Added structure for model documentation, as well as writing the documentation for the Node and View classes. Set up .gitignore to not worry about the docs build directory.
Stephen Burrows [Fri, 28 Jan 2011 20:17:46 +0000 (15:17 -0500)]
Initial docs work. Includes intro to philo and initial setup instructions.
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.