philo.git
13 years agoUpdates to gilbert for django 1.3
Stephen Burrows [Thu, 31 Mar 2011 19:36:30 +0000 (15:36 -0400)]
Updates to gilbert for django 1.3

13 years agoImproved reporting of deletion consequences. Removed vestigial "Advanced" menu.
Stephen Burrows [Tue, 5 Apr 2011 21:07:59 +0000 (17:07 -0400)]
Improved reporting of deletion consequences. Removed vestigial "Advanced" menu.

13 years agoAdded a column type for handling foreign keys in grid views.
Stephen Burrows [Tue, 5 Apr 2011 18:43:39 +0000 (14:43 -0400)]
Added a column type for handling foreign keys in grid views.

13 years agoAdded __unicode__ to loaded fk data. Added doubleclick loading of model instances...
Stephen Burrows [Fri, 1 Apr 2011 21:24:07 +0000 (17:24 -0400)]
Added __unicode__ to loaded fk data. Added doubleclick loading of model instances from model grids. Added caching of model instance forms - only one edit form can be open at once.

13 years agoCorrected ExtMethod keyword generation to eliminate unicode. Added capfirst use for...
Stephen Burrows [Thu, 31 Mar 2011 21:45:00 +0000 (17:45 -0400)]
Corrected ExtMethod keyword generation to eliminate unicode. Added capfirst use for field column headers. Made some initial gilbert ModelAdmins for penfield.

13 years agoUpdates to gilbert. Reorganizing imports and removing support for python < 2.5.4.
Stephen Burrows [Thu, 31 Mar 2011 19:36:30 +0000 (15:36 -0400)]
Updates to gilbert. Reorganizing imports and removing support for python < 2.5.4.

13 years agoMerge branch 'master' into gilbert
Stephen Burrows [Thu, 31 Mar 2011 18:27:44 +0000 (14:27 -0400)]
Merge branch 'master' into gilbert

Conflicts:
forms/entities.py

13 years agoImproved TemplateValidator error reporting to include origins and line numbers in...
Stephen Burrows [Thu, 31 Mar 2011 16:38:22 +0000 (12:38 -0400)]
Improved TemplateValidator error reporting to include origins and line numbers in TemplateSyntaxError reports.

13 years agoResolves issue 68 by treating any incorrectly-passed-in values for JSON fields as...
Stephen Burrows [Thu, 31 Mar 2011 15:06:49 +0000 (11:06 -0400)]
Resolves issue 68 by treating any incorrectly-passed-in values for JSON fields as json strings rather than as python objects.

13 years agoResolved issue #120 by removing detection of containers which would not be rendered.
Stephen Burrows [Wed, 30 Mar 2011 19:44:15 +0000 (15:44 -0400)]
Resolved issue #120 by removing detection of containers which would not be rendered.

13 years agoMade uuid of event autogenerated. Fully resolves issue #119. Also had to reset julian...
Stephen Burrows [Wed, 30 Mar 2011 19:06:09 +0000 (15:06 -0400)]
Made uuid of event autogenerated. Fully resolves issue #119. Also had to reset julian migrations again.

13 years agoJulian improvements: Made calendar events optional and made calendar feed uuids auto...
Stephen Burrows [Tue, 29 Mar 2011 18:16:55 +0000 (14:16 -0400)]
Julian improvements: Made calendar events optional and made calendar feed uuids auto-generated. Reset the migrations because south wasn't cooperating.

13 years agoAdjusted 14082 hack again... "fixed" the ModelFormMetaclass.__new__ method and wrote...
Stephen Burrows [Tue, 29 Mar 2011 17:07:13 +0000 (13:07 -0400)]
Adjusted 14082 hack again... "fixed" the ModelFormMetaclass.__new__ method and wrote EntityFormMetaclass as if there was no issue.

13 years agoMerge branch 'julian' of git://github.com/lapilofu/philo
Stephen Burrows [Mon, 28 Mar 2011 21:16:24 +0000 (17:16 -0400)]
Merge branch 'julian' of git://github.com/lapilofu/philo

13 years agoMoved the EventQuerySet to its own class instead of nesting it in the Event model.
Harris Lapiroff [Mon, 28 Mar 2011 20:19:34 +0000 (16:19 -0400)]
Moved the EventQuerySet to its own class instead of nesting it in the Event model.

13 years agoRemoved python 2.4 compatibility workaround use, since this is removed in Django...
Stephen Burrows [Mon, 28 Mar 2011 18:21:28 +0000 (14:21 -0400)]
Removed python 2.4 compatibility workaround use, since this is removed in Django 1.3 and philo doesn't support python 2.4 anyway.

13 years agoResolves issue #71 for the admin interface by working around the use of modelform_fac...
Stephen Burrows [Thu, 24 Mar 2011 21:58:57 +0000 (17:58 -0400)]
Resolves issue #71 for the admin interface by working around the use of modelform_factory. If any code uses modelform_factory elsewhere with an entity form, the same issue will arise. Also compatible with 1.2.X.

13 years agoImproved proxy-field hiding to be 1.3-proof. Unfortunately, requires a attribute...
Stephen Burrows [Thu, 24 Mar 2011 18:58:13 +0000 (14:58 -0400)]
Improved proxy-field hiding to be 1.3-proof. Unfortunately, requires a  attribute on the proxy admin, but it seems like the best way. Still backwards-compatible with 1.2.X.

13 years agoRemoved shipherd navigation_host filter exception reraising. Tweaked LazyNode - turns...
Stephen Burrows [Wed, 23 Mar 2011 20:00:11 +0000 (16:00 -0400)]
Removed shipherd navigation_host filter exception reraising. Tweaked LazyNode - turns out the / needs to be prepended *before* trying to check if the node handles_subpath.

13 years agoAdded some convenient methods to event querysets.
Harris Lapiroff [Wed, 23 Mar 2011 17:24:12 +0000 (13:24 -0400)]
Added some convenient methods to event querysets.

13 years agoSwitched Template.__unicode__ to only return self.name for legibility.
Stephen Burrows [Wed, 23 Mar 2011 15:31:23 +0000 (11:31 -0400)]
Switched Template.__unicode__ to only return self.name for legibility.

13 years agoMade a slight change to window position randomization; now only non-modal windows... gilbert
Joseph Spiros [Tue, 22 Mar 2011 19:16:51 +0000 (15:16 -0400)]
Made a slight change to window position randomization; now only non-modal windows are positioned randomly.

13 years agoFixed the password change form on the client side, and fixed form handling in the...
Joseph Spiros [Tue, 22 Mar 2011 19:12:27 +0000 (15:12 -0400)]
Fixed the password change form on the client side, and fixed form handling in the auth and models plugins server-side.

13 years agoMade new windows position themselves randomly.
Joseph Spiros [Tue, 22 Mar 2011 18:52:49 +0000 (14:52 -0400)]
Made new windows position themselves randomly.
A better solution than this should be found, but for now this will avoid confusion when many windows of the same size are stacked.

13 years agoAdded theme switching to auth plugin. Tries to do it live, but some windows may need...
Joseph Spiros [Tue, 22 Mar 2011 18:30:47 +0000 (14:30 -0400)]
Added theme switching to auth plugin. Tries to do it live, but some windows may need resizing to redraw using the new theme's metrics.

13 years agoCleaned up model grids a bit and added basic validation for edit/delete actions.
Joseph Spiros [Tue, 22 Mar 2011 17:30:55 +0000 (13:30 -0400)]
Cleaned up model grids a bit and added basic validation for edit/delete actions.

13 years agoMerge branch 'julian'
Stephen Burrows [Tue, 22 Mar 2011 16:15:17 +0000 (12:15 -0400)]
Merge branch 'julian'

13 years agoAll of my work from commits: dd4a194, 692644a, 4a60203, 5de46bc, 152042d, 64a2d4e...
Joseph Spiros [Mon, 21 Mar 2011 15:39:05 +0000 (11:39 -0400)]
All of my work from commits: dd4a194692644a4a602035de46bc152042d64a2d4eb9f0257d609f33e22b266d36aedaef49b867fcf33cd70b95672004003fcd769283b1c5c9ad9e6d5e2b6dd5f7276c26a6db6761d6b9022310ae55c5e7a51153f72b0f5a3be772079db6e5e167991f4c605.

13 years agoMerge branch 'master' into gilbert
Joseph Spiros [Mon, 21 Mar 2011 15:37:44 +0000 (11:37 -0400)]
Merge branch 'master' into gilbert

* master: (25 commits)
  Added feed length limit to FeedView. Implements feature #111.
  Corrected LazyNavigationRecurser to mark its return value as safe.
  Switched back to setting a {{ children }} variable, but set it to a lazy recurser instead of a rendered result. Switched item and children to be set in the context directly for easy access. Improved/updated recursenavigation docstring.
  Refactored the RecurseNavigationNode to have less repetition. Switched from {{ children }} to {% recurse %} because it makes more sense to collect recursion only if needed.
  Added a number of counting variables to the context when rendering shipherd navigation. Designed to mirror the variables generated when using a for loop.
  Minor corrections to shipherd recursenavigation docstring.
  Added CSRF cookie js to TagCreation.js... apparently it isn't in the admin by default. Resolves issue 83.
  Added an admin action to NewsletterArticleAdmin to handle creating a NewsletterIssue from a selection of articles. Resolves issue 82.
  Minor LazyContainerFinder cleanup. It's not really that lazy in practice...
  Removed nodelist_crawl since nothing is using it and I'm starting to question its usefulness in general.
  Built a clearer algorithm for finding a template's containers; added support for template block overrides cancelling out containers in that block, which resolves issue #90.
  Corrected FeedView handling of incorrect Accept headers. Will now actually return 406 errors.
  Genericized nodelist_crawl to just pass each node to a callback function. Overloaded the Template.containers callback to create a blockcontext for handling containers in overridden blocks as per issue 90 and to handle contentreference/contentlet generation in a single sweep.
  Refactored ContainerForms to reflect a more suitable structure by storing the containers internally as a SortedDict. By handling containers more consistently, this commit resolves issue #89.
  Removed apparently-vestigial Entity.attribute property.
  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.
  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.
  ...

13 years agoCorrected node_view redirection of trailing slashes to non-trailing slashes to rely...
Stephen Burrows [Wed, 16 Mar 2011 20:33:47 +0000 (16:33 -0400)]
Corrected node_view redirection of trailing slashes to non-trailing slashes to rely on request._cached_node_path instead of request.path. Tweaked LazyNode to only return a found node if it handles the found subpath.

13 years agoMerge branch 'master' into julian
Stephen Burrows [Sat, 5 Mar 2011 21:17:12 +0000 (16:17 -0500)]
Merge branch 'master' into julian

13 years agoAdded feed_length to BlogViewAdmin.
Stephen Burrows [Thu, 3 Mar 2011 22:10:16 +0000 (17:10 -0500)]
Added feed_length to BlogViewAdmin.

13 years agoMerge branch 'search'
Stephen Burrows [Thu, 3 Mar 2011 22:14:02 +0000 (17:14 -0500)]
Merge branch 'search'

13 years agoMerge branch 'master' of git://github.com/melinath/philo
Joseph Spiros [Thu, 3 Mar 2011 20:38:44 +0000 (15:38 -0500)]
Merge branch 'master' of git://github.com/melinath/philo

* 'master' of git://github.com/melinath/philo:
  Added feed length limit to FeedView. Implements feature #111.
  Corrected LazyNavigationRecurser to mark its return value as safe.
  Switched back to setting a {{ children }} variable, but set it to a lazy recurser instead of a rendered result. Switched item and children to be set in the context directly for easy access. Improved/updated recursenavigation docstring.
  Refactored the RecurseNavigationNode to have less repetition. Switched from {{ children }} to {% recurse %} because it makes more sense to collect recursion only if needed.
  Added a number of counting variables to the context when rendering shipherd navigation. Designed to mirror the variables generated when using a for loop.
  Minor corrections to shipherd recursenavigation docstring.
  Added CSRF cookie js to TagCreation.js... apparently it isn't in the admin by default. Resolves issue 83.
  Added an admin action to NewsletterArticleAdmin to handle creating a NewsletterIssue from a selection of articles. Resolves issue 82.
  Minor LazyContainerFinder cleanup. It's not really that lazy in practice...
  Removed nodelist_crawl since nothing is using it and I'm starting to question its usefulness in general.
  Built a clearer algorithm for finding a template's containers; added support for template block overrides cancelling out containers in that block, which resolves issue #90.
  Corrected FeedView handling of incorrect Accept headers. Will now actually return 406 errors.
  Genericized nodelist_crawl to just pass each node to a callback function. Overloaded the Template.containers callback to create a blockcontext for handling containers in overridden blocks as per issue 90 and to handle contentreference/contentlet generation in a single sweep.
  Refactored ContainerForms to reflect a more suitable structure by storing the containers internally as a SortedDict. By handling containers more consistently, this commit resolves issue #89.
  Removed apparently-vestigial Entity.attribute property.

13 years agoAdded feed length limit to FeedView. Implements feature #111.
Stephen Burrows [Thu, 3 Mar 2011 20:01:30 +0000 (15:01 -0500)]
Added feed length limit to FeedView. Implements feature #111.

13 years agoCorrected LazyNavigationRecurser to mark its return value as safe.
Stephen Burrows [Thu, 3 Mar 2011 17:27:08 +0000 (12:27 -0500)]
Corrected LazyNavigationRecurser to mark its return value as safe.

13 years agoSwitched back to setting a {{ children }} variable, but set it to a lazy recurser...
Stephen Burrows [Thu, 3 Mar 2011 17:10:24 +0000 (12:10 -0500)]
Switched back to setting a {{ children }} variable, but set it to a lazy recurser instead of a rendered result. Switched item and children to be set in the context directly for easy access. Improved/updated recursenavigation docstring.

13 years agoRefactored the RecurseNavigationNode to have less repetition. Switched from {{ childr...
Stephen Burrows [Wed, 2 Mar 2011 22:35:20 +0000 (17:35 -0500)]
Refactored the RecurseNavigationNode to have less repetition. Switched from {{ children }} to {% recurse %} because it makes more sense to collect recursion only if needed.

13 years agoMerge branch 'master' of git://github.com/lapilofu/philo
Stephen Burrows [Wed, 2 Mar 2011 21:21:31 +0000 (16:21 -0500)]
Merge branch 'master' of git://github.com/lapilofu/philo

13 years agoSolidified AJAX API.
Stephen Burrows [Wed, 2 Mar 2011 21:16:22 +0000 (16:16 -0500)]
Solidified AJAX API.

13 years agoMerge remote branch 'melinath/master'
Harris Lapiroff [Wed, 2 Mar 2011 19:59:25 +0000 (14:59 -0500)]
Merge remote branch 'melinath/master'

13 years agoAdded a number of counting variables to the context when rendering shipherd navigatio...
Harris Lapiroff [Wed, 2 Mar 2011 19:54:59 +0000 (14:54 -0500)]
Added a number of counting variables to the context when rendering shipherd navigation. Designed to mirror the variables generated when using a for loop.

13 years agoPrettified results page. Added search results templates for grappelli and the normal...
Stephen Burrows [Wed, 2 Mar 2011 18:01:28 +0000 (13:01 -0500)]
Prettified results page. Added search results templates for grappelli and the normal admin.

13 years agoRefactored weight code to split the work over Search, ResultURL, and Click models...
Stephen Burrows [Tue, 1 Mar 2011 22:25:45 +0000 (17:25 -0500)]
Refactored weight code to split the work over Search, ResultURL, and Click models. This is probably somewhat less efficient, but it makes more intuitive sense. It also allows for weight caching on instances. Initial work on a results action/view for the SearchAdmin. Set SearchView to have SearchForm set as an attribute on itself rather than blindly using it.

13 years agoMinor corrections to shipherd recursenavigation docstring.
Stephen Burrows [Mon, 28 Feb 2011 21:56:39 +0000 (16:56 -0500)]
Minor corrections to shipherd recursenavigation docstring.

13 years agoFirst attempts at a get_favored_results method to find what people are generally...
Stephen Burrows [Thu, 24 Feb 2011 22:45:23 +0000 (17:45 -0500)]
First attempts at a get_favored_results method to find what people are generally selecting. Some minor aesthetic changes. Changed ajax api template fetch to call get_template with the intent of passing an argument as to whether it should be prepped for ajax.

13 years agoMerge branch 'master' into search
Stephen Burrows [Thu, 24 Feb 2011 19:07:40 +0000 (14:07 -0500)]
Merge branch 'master' into search

13 years agoAdded CSRF cookie js to TagCreation.js... apparently it isn't in the admin by default...
Stephen Burrows [Thu, 24 Feb 2011 17:38:28 +0000 (12:38 -0500)]
Added CSRF cookie js to TagCreation.js... apparently it isn't in the admin by default. Resolves issue 83.

13 years agoAdded an admin action to NewsletterArticleAdmin to handle creating a NewsletterIssue...
Stephen Burrows [Thu, 24 Feb 2011 17:20:19 +0000 (12:20 -0500)]
Added an admin action to NewsletterArticleAdmin to handle creating a NewsletterIssue from a selection of articles. Resolves issue 82.

13 years agoMerge branch 'block_container_override'
Stephen Burrows [Thu, 24 Feb 2011 16:32:11 +0000 (11:32 -0500)]
Merge branch 'block_container_override'

13 years agoMinor LazyContainerFinder cleanup. It's not really that lazy in practice...
Stephen Burrows [Thu, 24 Feb 2011 16:31:56 +0000 (11:31 -0500)]
Minor LazyContainerFinder cleanup. It's not really that lazy in practice...

13 years agoRemoved nodelist_crawl since nothing is using it and I'm starting to question its...
Stephen Burrows [Wed, 23 Feb 2011 22:03:59 +0000 (17:03 -0500)]
Removed nodelist_crawl since nothing is using it and I'm starting to question its usefulness in general.

13 years agoBuilt a clearer algorithm for finding a template's containers; added support for...
Stephen Burrows [Wed, 23 Feb 2011 21:53:19 +0000 (16:53 -0500)]
Built a clearer algorithm for finding a template's containers; added support for template block overrides cancelling out containers in that block, which resolves issue #90.

13 years agoCorrected FeedView handling of incorrect Accept headers. Will now actually return...
Stephen Burrows [Wed, 23 Feb 2011 16:50:50 +0000 (11:50 -0500)]
Corrected FeedView handling of incorrect Accept headers. Will now actually return 406 errors.

13 years agoGenericized nodelist_crawl to just pass each node to a callback function. Overloaded...
Stephen Burrows [Wed, 23 Feb 2011 15:48:27 +0000 (10:48 -0500)]
Genericized nodelist_crawl to just pass each node to a callback function. Overloaded the Template.containers callback to create a blockcontext for handling containers in overridden blocks as per issue 90 and to handle contentreference/contentlet generation in a single sweep.

13 years agoRefactored ContainerForms to reflect a more suitable structure by storing the contain...
Stephen Burrows [Tue, 22 Feb 2011 20:32:15 +0000 (15:32 -0500)]
Refactored ContainerForms to reflect a more suitable structure by storing the containers internally as a SortedDict. By handling containers more consistently, this commit resolves issue #89.

13 years agoRemoved apparently-vestigial Entity.attribute property.
Stephen Burrows [Mon, 21 Feb 2011 22:22:24 +0000 (17:22 -0500)]
Removed apparently-vestigial Entity.attribute property.

13 years agoMerge branch 'master' of git://github.com/melinath/philo
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.

13 years agoCorrected JSONValue.__unicode__ to return unicode instead of bytestrings... not sure...
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.

13 years agoUpdated CalendarView urlpatterns to use the new feed_patterns method.
Stephen Burrows [Mon, 21 Feb 2011 15:00:38 +0000 (10:00 -0500)]
Updated CalendarView urlpatterns to use the new feed_patterns method.

13 years agoMerge branch 'master' into julian
Stephen Burrows [Mon, 21 Feb 2011 14:33:29 +0000 (09:33 -0500)]
Merge branch 'master' into julian

13 years agoCorrected WaldoAuthenticationForm.clean to handle lack of password/username. Moved...
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.

13 years agoTweaked TargetURLModel.get_reverse_params() to convert kwargs keys to bytestrings...
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

13 years agoMinor correction to BlogView.urlpatterns.
Stephen Burrows [Fri, 18 Feb 2011 18:47:05 +0000 (13:47 -0500)]
Minor correction to BlogView.urlpatterns.

13 years agoMerge branch 'master' of git://github.com/melinath/philo
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.

13 years agoSwitched feed_patterns to return urlpatterns suitable for addition to urlpatterns...
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.

13 years agoMerge branch 'master' into gilbert
Joseph Spiros [Wed, 16 Feb 2011 20:15:46 +0000 (15:15 -0500)]
Merge branch 'master' into gilbert

* master: (135 commits)
  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.
  Added indices to all Attribute fields to improve lookup speed. Added related_lookup_fields to NodeAdmin for grappelli forward-compatibility.
  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.
  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.
  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.
  ...

Conflicts:
README

13 years agoMerge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert
Joseph Spiros [Wed, 16 Feb 2011 20:03:28 +0000 (15:03 -0500)]
Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert

* 'gilbert' of git://github.com/lapilofu/philo:
  Fixed a faulty image reference on menu buttons FOR REAL.

13 years agoFixed a faulty image reference on menu buttons FOR REAL.
Harris Lapiroff [Wed, 16 Feb 2011 19:46:03 +0000 (14:46 -0500)]
Fixed a faulty image reference on menu buttons FOR REAL.

13 years agoSwitched user authentication in waldo from the login view to an AuthenticationForm...
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.

13 years agoAdded admin sugar for julian models. Corrected minor typos and omissions. Filled...
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.

13 years agoCorrected penfield BlogView handling of tags, particularly related to feed links...
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.

13 years agoReinstated EventAdmin fieldsets and added some options. Filled out the page requireme...
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.

13 years agoMerge branch 'master' into julian
Stephen Burrows [Mon, 14 Feb 2011 19:13:19 +0000 (14:13 -0500)]
Merge branch 'master' into julian

13 years agoCorrected Waldo AccountMultiView typo and improved View error reporting / TargetURL...
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.

13 years agoInitial implementation of a working ICalendarFeedView based on the Django syndication...
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.

13 years agoRemoved location models and subclass limiting in favor of a ContentTypeRegistryLimite...
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.

13 years agoMinor tweak to has_navigation filter to silence all errors and return False.
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.

13 years agoCorrected penfield migration which introduces the feed_type column. Switched Navigati...
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.

13 years agoRemoved julian/tests.py and julian/views.py. Switched Location handling from a settin...
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.

13 years agoMerge branch 'master' of git://github.com/melinath/philo
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.

13 years agoMerge branch 'master' into julian
Stephen Burrows [Wed, 9 Feb 2011 15:30:58 +0000 (10:30 -0500)]
Merge branch 'master' into julian

13 years agoAdded db_index to Contentlet/ContentReference names, AttributeValue fields, and Navig...
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.

13 years agoMerge branch 'better_feeds'
Stephen Burrows [Tue, 8 Feb 2011 22:10:47 +0000 (17:10 -0500)]
Merge branch 'better_feeds'

13 years agoMinor fixes and additions to better_feeds following testing.
Stephen Burrows [Tue, 8 Feb 2011 22:05:29 +0000 (17:05 -0500)]
Minor fixes and additions to better_feeds following testing.

13 years agoMerge branch 'master' of git://github.com/melinath/philo
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.

13 years agoAdded indices to all Attribute fields to improve lookup speed. Added related_lookup_f...
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.

13 years agoMoved FeedMultiViewMixin to models.py and renamed to FeedView. Improved feed type...
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.

13 years agoTweaked LazyNode to handle trailing slashes. Corrected missing import in models/nodes.py.
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.

13 years agoCorrected shipherd handling of the navigation_items related_name following commit...
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.

13 years agoRemoved trailing_pathsep support from TreeManager.get_with_path. Set nodes to have...
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.

13 years agoAdded an abstract TargetURLModel to handle issues related to targeting a node, a...
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.

13 years agoMinor correction to LazyNode's use of subpath to avoid NameErrors.
Stephen Burrows [Thu, 3 Feb 2011 03:17:25 +0000 (22:17 -0500)]
Minor correction to LazyNode's use of subpath to avoid NameErrors.

13 years agoMinor cleanup to penfield.utils after get_absolute_url refactor.
Stephen Burrows [Wed, 2 Feb 2011 17:05:11 +0000 (12:05 -0500)]
Minor cleanup to penfield.utils after get_absolute_url refactor.

13 years agoRefactored Node.get_absolute_url and related functions (such as MultiView.reverse...
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.

13 years agoRegistered Tag as a value model.
Stephen Burrows [Tue, 1 Feb 2011 17:04:11 +0000 (12:04 -0500)]
Registered Tag as a value model.

13 years agoModel changes.
Kriti Godey [Tue, 1 Feb 2011 10:04:51 +0000 (05:04 -0500)]
Model changes.

13 years agoCorrected EntityAdminMetaclass handling of inherited vs. declared readonly_fields.
Stephen Burrows [Mon, 31 Jan 2011 21:25:16 +0000 (16:25 -0500)]
Corrected EntityAdminMetaclass handling of inherited vs. declared readonly_fields.

13 years agoClarified error messages and docstrings in models/nodes.py. Removed an extraneous...
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.

13 years agoCorrected SlugMultipleChoiceField introspection rule.
Stephen Burrows [Mon, 31 Jan 2011 15:06:02 +0000 (10:06 -0500)]
Corrected SlugMultipleChoiceField introspection rule.