melinath [Wed, 18 Aug 2010 20:12:22 +0000 (16:12 -0400)]
Display of ContainerFormSets functional; display of their values is not; saving of values, however, is.
melinath [Wed, 18 Aug 2010 19:03:07 +0000 (15:03 -0400)]
Initial new page admin commit. Working on faking the admin out through inlines instead of ModelAdmin methods.
Joseph Spiros [Fri, 20 Aug 2010 21:21:27 +0000 (17:21 -0400)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Re-tweaked page add form to preserve 'continue on normal save' functionality. This is implemented with javascript and will probably break some time in the future, but there doesn't seem to be a better way to do it at the moment. Fixes bug #8.
Tweaked page add_form template. Fixes bug #8.
Moved templateform to forms.py in preparation for experimentation with page forms.
Added collapse classes to attribute and relationship inlines on entities.
Added template code validation to the admin. This essentially addresses bug #14 by catching errors with validation on templates instead of letting it show up as a server error later. (Note that there should still be better validation on Pages, as deletion of a template say on the filesystem could render a db-driven template invalid.)
Set TreeModel slug field length to 255 to match Titled
melinath [Thu, 19 Aug 2010 16:02:10 +0000 (12:02 -0400)]
Re-tweaked page add form to preserve 'continue on normal save' functionality. This is implemented with javascript and will probably break some time in the future, but there doesn't seem to be a better way to do it at the moment. Fixes bug #8.
melinath [Wed, 18 Aug 2010 22:00:40 +0000 (18:00 -0400)]
Tweaked page add_form template. Fixes bug #8.
melinath [Wed, 18 Aug 2010 14:25:10 +0000 (10:25 -0400)]
Moved templateform to forms.py in preparation for experimentation with page forms.
melinath [Tue, 17 Aug 2010 17:09:37 +0000 (13:09 -0400)]
Added collapse classes to attribute and relationship inlines on entities.
melinath [Tue, 17 Aug 2010 16:16:20 +0000 (12:16 -0400)]
Added template code validation to the admin. This essentially addresses bug #14 by catching errors with validation on templates instead of letting it show up as a server error later. (Note that there should still be better validation on Pages, as deletion of a template say on the filesystem could render a db-driven template invalid.)
melinath [Tue, 17 Aug 2010 16:15:31 +0000 (12:15 -0400)]
Set TreeModel slug field length to 255 to match Titled
Joseph Spiros [Thu, 12 Aug 2010 23:31:19 +0000 (19:31 -0400)]
The blog ForeignKey on the BlogEntry model can now be blank and null.
Joseph Spiros [Thu, 12 Aug 2010 21:04:38 +0000 (17:04 -0400)]
Explicit declaration of keys for AttributeFields and RelationshipFields is now unnecessary, as they will use the attribute name on the model class they were assigned to by default. This implements feature #20.
Joseph Spiros [Thu, 12 Aug 2010 20:53:20 +0000 (16:53 -0400)]
Fixed some issues that broke fieldset definitions on ModelAdmins which used EntityForm or its subclasses.
Joseph Spiros [Wed, 11 Aug 2010 22:46:32 +0000 (18:46 -0400)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Adjusted the paginate function to only attempt a length check if per_page is valid. Addresses bug #19.
Stephen Burrows [Wed, 11 Aug 2010 21:24:43 +0000 (17:24 -0400)]
Adjusted the paginate function to only attempt a length check if per_page is valid. Addresses bug #19.
Joseph Spiros [Wed, 11 Aug 2010 20:14:07 +0000 (16:14 -0400)]
Merge branch 'node_absolute_urls' of git://github.com/melinath/philo
* 'node_absolute_urls' of git://github.com/melinath/philo:
Implements get_absolute_url for nodes (Feature #17). Fixes that mysterious 'name' bug. ;-)
Joseph Spiros [Wed, 11 Aug 2010 20:10:54 +0000 (16:10 -0400)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Paginator returns page.object_list as objects if a page exists.
Implements render_to_string on Page model for cases where this is used to render i.e. emails (Feature #18)
Unimplemented PaginationProxy; moved pagination from penfield to core.
Multiview will now pass node and extra_context to any view that takes kwargs. Fixes bug #10
Added forgotten import of EmptyPage.
Introduced the PaginationProxy object to simplify use in templates.
Revised penfield's pagination helper to work more generically.
Stephen Burrows [Wed, 11 Aug 2010 14:43:11 +0000 (10:43 -0400)]
Paginator returns page.object_list as objects if a page exists.
Stephen Burrows [Tue, 10 Aug 2010 23:09:52 +0000 (19:09 -0400)]
Implements render_to_string on Page model for cases where this is used to render i.e. emails (Feature #18)
Stephen Burrows [Tue, 10 Aug 2010 19:51:39 +0000 (15:51 -0400)]
Implements get_absolute_url for nodes (Feature #17). Fixes that mysterious 'name' bug. ;-)
Stephen Burrows [Tue, 10 Aug 2010 17:24:36 +0000 (13:24 -0400)]
Unimplemented PaginationProxy; moved pagination from penfield to core.
Stephen Burrows [Mon, 9 Aug 2010 15:40:24 +0000 (11:40 -0400)]
Merge branch 'new_paginator'
Stephen Burrows [Mon, 9 Aug 2010 11:50:51 +0000 (07:50 -0400)]
Multiview will now pass node and extra_context to any view that takes kwargs. Fixes bug #10
Stephen Burrows [Mon, 9 Aug 2010 11:15:59 +0000 (07:15 -0400)]
Added forgotten import of EmptyPage.
Stephen Burrows [Thu, 5 Aug 2010 22:12:22 +0000 (18:12 -0400)]
Introduced the PaginationProxy object to simplify use in templates.
Stephen Burrows [Thu, 5 Aug 2010 20:02:21 +0000 (16:02 -0400)]
Revised penfield's pagination helper to work more generically.
Joseph Spiros [Mon, 9 Aug 2010 09:28:56 +0000 (05:28 -0400)]
Fixed a grave error wherein Node did not have a TreeManager as its default manager, due to superclasses being declared in an order incompatible with Entity's use of EntityBase as its metaclass.
Joseph Spiros [Mon, 9 Aug 2010 09:09:35 +0000 (05:09 -0400)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Added unique_together constraint to Attributes and Relationships.
Added a bit to newsletters to streamline interactions with them.
Joseph Spiros [Mon, 9 Aug 2010 09:06:29 +0000 (05:06 -0400)]
Merge branch 'master' of git://github.com/kgodey/philo
* 'master' of git://github.com/kgodey/philo:
Added archives support to get_subpath in penfield's BlogView.
Registered Node in register_value_model.
Added "entry_dates" method to model to provide distinct yearly, monthly and daily dates for posts.
Joseph Spiros [Mon, 9 Aug 2010 06:35:54 +0000 (02:35 -0400)]
Merge branch 'entity-proxy-fields'
* entity-proxy-fields:
Implemented EntityForm, which knows how to deal with AttributeFields and RelationshipFields on the underlying model. To be consistent with Attributes, Relationships now support null values. This changes the schema.
AttributeFields and RelationshipFields now store their changes and do not commit them until their model has been saved.
Initial implementation of AttributeField and RelationshipField. These objects are not actual Fields, but rather they simply add descriptors to Entity subclasses which provide transparent access to specific attributes and relationships.
Joseph Spiros [Mon, 9 Aug 2010 06:30:10 +0000 (02:30 -0400)]
Implemented EntityForm, which knows how to deal with AttributeFields and RelationshipFields on the underlying model.
To be consistent with Attributes, Relationships now support null values. This changes the schema.
Stephen Burrows [Thu, 5 Aug 2010 18:06:23 +0000 (14:06 -0400)]
Added unique_together constraint to Attributes and Relationships.
Joseph Spiros [Sun, 1 Aug 2010 08:55:42 +0000 (04:55 -0400)]
AttributeFields and RelationshipFields now store their changes and do not commit them until their model has been saved.
Joseph Spiros [Sat, 31 Jul 2010 03:16:52 +0000 (23:16 -0400)]
Initial implementation of AttributeField and RelationshipField.
These objects are not actual Fields, but rather they simply add descriptors to Entity subclasses which provide transparent access to specific attributes and relationships.
Kriti Godey [Sun, 25 Jul 2010 20:02:57 +0000 (01:32 +0530)]
Added archives support to get_subpath in penfield's BlogView.
Kriti Godey [Fri, 23 Jul 2010 14:26:55 +0000 (19:56 +0530)]
Registered Node in register_value_model.
Kriti Godey [Fri, 23 Jul 2010 14:06:51 +0000 (19:36 +0530)]
Added "entry_dates" method to model to provide distinct yearly, monthly and daily dates for posts.
melinath [Thu, 22 Jul 2010 22:37:31 +0000 (18:37 -0400)]
Added a bit to newsletters to streamline interactions with them.
Joseph Spiros [Wed, 21 Jul 2010 16:55:17 +0000 (12:55 -0400)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Membersof now uses 'app_label.model'; removed blockcontainer
Slight changes to penfield NewsletterIssueAdmin & added newsletter value models
melinath [Wed, 14 Jul 2010 17:48:16 +0000 (13:48 -0400)]
Membersof now uses 'app_label.model'; removed blockcontainer
melinath [Wed, 14 Jul 2010 15:08:21 +0000 (11:08 -0400)]
Slight changes to penfield NewsletterIssueAdmin & added newsletter value models
Joseph Spiros [Thu, 15 Jul 2010 03:25:36 +0000 (23:25 -0400)]
MultiViews now clear_url_caches before resolving URLs, needed to allow them to change their urls dynamically at runtime.
Joseph Spiros [Thu, 15 Jul 2010 03:05:36 +0000 (23:05 -0400)]
Fixed the node_url templatetag's generation of URLs.
Joseph Spiros [Thu, 15 Jul 2010 02:46:00 +0000 (22:46 -0400)]
Implementing get_subpath on NewsletterView so that the node_url templatetag will work.
Joseph Spiros [Thu, 15 Jul 2010 01:37:13 +0000 (21:37 -0400)]
Initial implementation of node_url templatetag.
Joseph Spiros [Fri, 9 Jul 2010 02:06:13 +0000 (02:06 +0000)]
Adding the 'monospace' class to container fieldsets in the Page admin.
Joseph Spiros [Thu, 8 Jul 2010 02:16:51 +0000 (22:16 -0400)]
Adding support to BlogView for filtering based on multiple tags.
Joseph Spiros [Thu, 8 Jul 2010 00:34:45 +0000 (20:34 -0400)]
Merge branch 'kgodey'
* kgodey:
Fixing a double declaration of the monthname filter, and renaming ap_monthname to apmonthname (matches apnumber from django.contrib.humanize).
Added templatetags "monthname" and "ap_monthname" to Penfield, which turn month numbers into month names.
Joseph Spiros [Thu, 8 Jul 2010 00:34:03 +0000 (20:34 -0400)]
Fixing a double declaration of the monthname filter, and renaming ap_monthname to apmonthname (matches apnumber from django.contrib.humanize).
Joseph Spiros [Thu, 8 Jul 2010 00:32:55 +0000 (20:32 -0400)]
Merge branch 'master' of git://github.com/kgodey/philo into kgodey
Joseph Spiros [Thu, 8 Jul 2010 00:30:30 +0000 (20:30 -0400)]
Merge branch 'master' of git://github.com/melinath/philo
* 'master' of git://github.com/melinath/philo:
Changed to delete empty contentreferences on pages instead of saving them as empty.
Minor corrections to containers to ensure setting of context var even in cases where content=None
Added admin imports
Kriti Godey [Wed, 7 Jul 2010 07:21:22 +0000 (12:51 +0530)]
Added templatetags "monthname" and "ap_monthname" to Penfield, which turn month numbers into month names.
melinath [Tue, 6 Jul 2010 17:26:20 +0000 (13:26 -0400)]
Merge branch 'master' of github.com/ithinksw/philo
melinath [Tue, 6 Jul 2010 16:29:12 +0000 (12:29 -0400)]
Changed to delete empty contentreferences on pages instead of saving them as empty.
Joseph Spiros [Mon, 5 Jul 2010 18:59:56 +0000 (14:59 -0400)]
Fixing a bug in BlogView's tag_view where it would provide a QuerySet as `tag` instead of the Tag instance.
Joseph Spiros [Mon, 5 Jul 2010 18:34:47 +0000 (14:34 -0400)]
Increasing the max_length of the slug field on Titled (and all subclasses).
Joseph Spiros [Mon, 5 Jul 2010 18:32:27 +0000 (14:32 -0400)]
Merge branch 'master' of git://github.com/kgodey/philo
* 'master' of git://github.com/kgodey/philo:
Fixed null constraint on entries_per_page in BlogView
Edited unicode methods and added some null=True, blank=True constraints.
Kriti Godey [Mon, 5 Jul 2010 18:29:35 +0000 (23:59 +0530)]
Fixed null constraint on entries_per_page in BlogView
Kriti Godey [Mon, 5 Jul 2010 17:57:03 +0000 (23:27 +0530)]
Edited unicode methods and added some null=True, blank=True constraints.
Joseph Spiros [Sat, 3 Jul 2010 13:08:45 +0000 (09:08 -0400)]
Adding __unicode__ to BlogViews.
Joseph Spiros [Fri, 2 Jul 2010 12:01:05 +0000 (08:01 -0400)]
Merge branch 'master' of git://github.com/kgodey/philo
* 'master' of git://github.com/kgodey/philo:
Updated models, created separate files called utils and validators.
Fixed File unicode method and added pagination to the BlogNode's index template. More robust pagination to be done.
Kriti Godey [Fri, 2 Jul 2010 11:54:56 +0000 (17:24 +0530)]
Merge branch 'penfield'
Kriti Godey [Fri, 2 Jul 2010 11:51:13 +0000 (17:21 +0530)]
Merge branch 'master' into penfield, cleaned up.
Kriti Godey [Fri, 2 Jul 2010 09:17:39 +0000 (14:47 +0530)]
Updated models, created separate files called utils and validators.
melinath [Thu, 1 Jul 2010 21:19:43 +0000 (17:19 -0400)]
Minor corrections to containers to ensure setting of context var even in cases where content=None
melinath [Thu, 1 Jul 2010 06:38:00 +0000 (02:38 -0400)]
Merge branch 'master' of git.ithinksw.org/philo
Joseph Spiros [Wed, 30 Jun 2010 11:44:35 +0000 (07:44 -0400)]
Added uniqueness constraints to Tag, NewsletterArticle, and NewsletterIssue, and added ordering to NewsletterArticle and NewsletterIssue.
Joseph Spiros [Wed, 30 Jun 2010 11:33:31 +0000 (07:33 -0400)]
Fleshed out NewsletterView further, and updated BlogView to match.
Joseph Spiros [Wed, 30 Jun 2010 00:04:32 +0000 (20:04 -0400)]
Switched all references to Templates in BlogViews and NewsletterViews for references to Pages.
Joseph Spiros [Tue, 29 Jun 2010 23:58:33 +0000 (19:58 -0400)]
Fixed a bug in ContentTypeSubclassLimiter whereby it would only return direct subclasses of the specified class. It now returns all non-abstract model subclasses, however deep in the class hierarchy.
Joseph Spiros [Tue, 29 Jun 2010 23:25:49 +0000 (19:25 -0400)]
MultiViews now pass extra_context and node to view functions that accept them as arguments.
Joseph Spiros [Tue, 29 Jun 2010 23:02:31 +0000 (19:02 -0400)]
Added support for tags to Blogs and BlogViews.
Joseph Spiros [Tue, 29 Jun 2010 22:39:56 +0000 (18:39 -0400)]
Added app_label to Tag. Removed app_label from abstract models, as it would be inherited by non-abstract subclasses in other applications.
melinath [Tue, 29 Jun 2010 19:08:27 +0000 (15:08 -0400)]
Merge branch 'master' of git.ithinksw.org/philo
Joseph Spiros [Tue, 29 Jun 2010 17:58:35 +0000 (13:58 -0400)]
Merge branch 'penfield'
* penfield:
Fleshed out Newsletter, NewsletterArticle, NewsletterIssue, and NewsletterView.
Moved Tag, and the Titled abstract model, from penfield into philo proper. Added support for a PHILO_PERSON_MODULE setting, and penfield models now refer to that for author fields (by default, it is set to auth.User, so in effect this changes nothing).
Switching to new Node/View system.
Tags implemented in Penfield, added to blog entries.
The index template gets a queryset of entries now.
Fixed date ordering.
Fixed blog entries plural and ordering.
Started implementation of Newsletter models.
Separating Blogs from the nodes that render them, creating BlogNodes.
Finished implementing blogs with the exception of tag support.
Initial skeleton of penfield application, and partial implementation of Entry and Blog models.
Joseph Spiros [Tue, 29 Jun 2010 17:56:12 +0000 (13:56 -0400)]
Fleshed out Newsletter, NewsletterArticle, NewsletterIssue, and NewsletterView
Joseph Spiros [Tue, 29 Jun 2010 15:37:39 +0000 (11:37 -0400)]
Moved Tag, and the Titled abstract model, from penfield into philo proper. Added support for a PHILO_PERSON_MODULE setting, and penfield models now refer to that for author fields (by default, it is set to auth.User, so in effect this changes nothing).
melinath [Tue, 29 Jun 2010 14:17:00 +0000 (10:17 -0400)]
Merge origin/master
melinath [Tue, 29 Jun 2010 14:15:12 +0000 (10:15 -0400)]
Added admin imports
Joseph Spiros [Mon, 28 Jun 2010 20:04:19 +0000 (16:04 -0400)]
Merge branch 'master' into penfield
Joseph Spiros [Mon, 28 Jun 2010 20:03:50 +0000 (16:03 -0400)]
Fixing imports on admin.widgets, forgot to move some from admin.base.
Joseph Spiros [Mon, 28 Jun 2010 20:00:30 +0000 (16:00 -0400)]
Merge branch 'master' into penfield
Joseph Spiros [Sun, 27 Jun 2010 11:15:15 +0000 (07:15 -0400)]
Changing the Template container node detection code to use the child_nodelists attribute implemented on relevant nodes in Django 1.2. Therefore, Django 1.2 is now required.
Joseph Spiros [Sat, 26 Jun 2010 13:08:28 +0000 (09:08 -0400)]
Merge branch 'master' into penfield
Joseph Spiros [Sat, 26 Jun 2010 13:06:18 +0000 (09:06 -0400)]
Adding extra_context to render_to_response on Nodes and Views, adding (attributes|relationships)_with_node to Views, and implemented usage of both additions in Page.
Joseph Spiros [Fri, 25 Jun 2010 18:11:12 +0000 (14:11 -0400)]
Merge branch 'penfield-new-nodes' into penfield
Joseph Spiros [Fri, 25 Jun 2010 18:10:19 +0000 (14:10 -0400)]
Switching to new Node/View system.
Joseph Spiros [Fri, 25 Jun 2010 18:05:36 +0000 (14:05 -0400)]
Merge branch 'master' into penfield-new-nodes
Joseph Spiros [Fri, 25 Jun 2010 17:58:04 +0000 (13:58 -0400)]
Initial implementation of new Node system whereby Nodes are separate from the objects that render them.
Joseph Spiros [Wed, 23 Jun 2010 17:32:19 +0000 (13:32 -0400)]
Merge branch 'master' into penfield
Joseph Spiros [Wed, 23 Jun 2010 17:30:58 +0000 (13:30 -0400)]
Minor cosmetic cleanup of model references following the models module restructuring.
Joseph Spiros [Wed, 23 Jun 2010 16:28:12 +0000 (12:28 -0400)]
Merge branch 'master' into penfield
Joseph Spiros [Wed, 23 Jun 2010 16:26:10 +0000 (12:26 -0400)]
Splitting models into submodules beside models.base.
Joseph Spiros [Wed, 23 Jun 2010 15:43:04 +0000 (11:43 -0400)]
Renaming models.all to models.base.
Joseph Spiros [Tue, 22 Jun 2010 16:43:02 +0000 (12:43 -0400)]
Switching models module to use a directory (models/) rather than a single file (models.py).
Joseph Spiros [Tue, 22 Jun 2010 16:12:37 +0000 (12:12 -0400)]
Merge branch 'master' into penfield
Joseph Spiros [Tue, 22 Jun 2010 16:12:12 +0000 (12:12 -0400)]
Merge branch 'melinath'
* melinath:
Pre-merge cleanup.
Switched URLRedirectValidator and URLLinkValidator to subclass directly from RegexValidator. --Avoids having to implement verify_exists for a link on a node that, say, might not even be on a site per se. If that's something I want later, I can look at it then... for now, this will fulfill its function just fine.
Explicated DoesNotExist exception for PageAdmin save_model method.
Added get_path fallback to slug to increase information flow by reducing the number of ? displayed
Revert Redirect unicode.
Added Redirect unicode.
Added redirect and link validators to allow internal-style absolute and relative links/redirects.
Fixed null content reference id bug.
Joseph Spiros [Tue, 22 Jun 2010 16:11:41 +0000 (12:11 -0400)]
Pre-merge cleanup.
Joseph Spiros [Tue, 22 Jun 2010 16:05:04 +0000 (12:05 -0400)]
Merge git://github.com/melinath/philo into melinath
* git://github.com/melinath/philo:
Switched URLRedirectValidator and URLLinkValidator to subclass directly from RegexValidator. --Avoids having to implement verify_exists for a link on a node that, say, might not even be on a site per se. If that's something I want later, I can look at it then... for now, this will fulfill its function just fine.
Explicated DoesNotExist exception for PageAdmin save_model method.
Added get_path fallback to slug to increase information flow by reducing the number of ? displayed
Revert Redirect unicode.
Added Redirect unicode.
Added redirect and link validators to allow internal-style absolute and relative links/redirects.
Fixed null content reference id bug.
melinath [Tue, 22 Jun 2010 02:01:25 +0000 (22:01 -0400)]
Switched URLRedirectValidator and URLLinkValidator to subclass directly from RegexValidator.
--Avoids having to implement verify_exists for a link on a node that, say, might not even be on a site per se. If that's something I want later, I can look at it then... for now, this will fulfill its function just fine.
Kriti Godey [Sun, 20 Jun 2010 07:19:42 +0000 (12:49 +0530)]
Fixed File unicode method and added pagination to the BlogNode's index template. More robust pagination to be done.