From: Joseph Spiros Date: Fri, 18 Feb 2011 15:40:14 +0000 (-0500) Subject: Merge branch 'master' of git://github.com/melinath/philo X-Git-Tag: philo-0.9~19 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/f6f8274ec87a79bfbcf6af6a998e9ff79e64d160 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. --- f6f8274ec87a79bfbcf6af6a998e9ff79e64d160