From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Mon, 29 Nov 2010 19:11:37 +0000 (-0500)
Subject: Merge branch 'master' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~25
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/caafce88e26fef7f0cd5be751c1f0fa8bd0b5a06?ds=inline

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.
---

caafce88e26fef7f0cd5be751c1f0fa8bd0b5a06