Merge branch 'hotfix/embed_widget' of git://github.com/lapilofu/philo into develop

* 'hotfix/embed_widget' of git://github.com/lapilofu/philo:
  Fixed a bug which was causing the embed widget to be unusable in Grappelli 2.3.8.

diff --git a/README b/README
index 630ea76..19977cd 100644 (file)
--- a/README
+++ b/README
@@ -16,4 +16,4 @@ After installing philo and mptt on your PYTHONPATH, make sure to complete the fo
 3. Include 'philo.urls' somewhere in your urls.py file.
 4. Optionally add a root node to your current Site.
 
-Philo should be ready to go! All that's left is to learn more <http://docs.philocms.org/> and contribute <http://docs.philocms.org/en/latest/contribute.html>.
+Philo should be ready to go! All that's left is to learn more <http://docs.philocms.org/> and contribute <http://docs.philocms.org/en/latest/contributing.html>.

diff --git a/README.markdown b/README.markdown
index 77ebb65..2653f52 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -17,4 +17,4 @@ After installing philo and mptt on your PYTHONPATH, make sure to complete the fo
 3. Include 'philo.urls' somewhere in your urls.py file.
 4. Optionally add a root node to your current Site.
 
-Philo should be ready to go! All that's left is to [learn more](http://docs.philocms.org/) and [contribute](http://docs.philocms.org/en/latest/contribute.html).
+Philo should be ready to go! All that's left is to [learn more](http://docs.philocms.org/) and [contribute](http://docs.philocms.org/en/latest/contributing.html).

diff --git a/docs/conf.py b/docs/conf.py
index d41e6e0..b1329ba 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -16,6 +16,7 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.append(os.path.abspath(os.path.dirname(__file__)))
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext")))
 sys.path.append(os.path.abspath(os.path.dirname(os.path.dirname(__file__))))
 

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 4c9fb7d..85fc311 100644 (file)
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -4,7 +4,7 @@ Contributing to Philo
 So you want to contribute to Philo? That's great! Here's some ways you can get started:
 
 * **Report bugs and request features** using the issue tracker at the `project site <http://project.philocms.org/>`_.
-* **Contribute code** using `git <http://git-scm.com/>`_. You can fork philo's repository either on `GitHub <http://github.com/ithinksw/philo/>`_ or `Gitorious <http://gitorious.org/ithinksw/philo/>`_. If you are contributing to Philo, you will need to submit a :ref:`Contributor License Agreement <cla>`.
+* **Contribute code** using `git <http://git-scm.com/>`_. You can fork philo's repository on `GitHub <http://github.com/ithinksw/philo/>`_, `Gitorious <http://gitorious.org/ithinksw/philo/>`_, or `Bitbucket <http://bitbucket.org/ithinksw/philo/>`_. If you are contributing to Philo, you will need to submit a :ref:`Contributor License Agreement <cla>`.
 * **Join the discussion** on IRC at `irc://irc.oftc.net/#philo <irc://irc.oftc.net/#philo>`_ if you have any questions or suggestions or just want to chat about the project. You can also keep in touch using the project mailing lists: `philo@ithinksw.org <mailto:philo@ithinksw.org>`_ and `philo-devel@ithinksw.org <mailto:philo-devel@ithinksw.org>`_.
 
 

diff --git a/philo/models/base.py b/philo/models/base.py
index e7918f5..8aef89a 100644 (file)
--- a/philo/models/base.py
+++ b/philo/models/base.py
@@ -284,7 +284,7 @@ class Entity(models.Model):
        """An abstract class that simplifies access to related attributes. Most models provided by Philo subclass Entity."""
        __metaclass__ = EntityBase
        
-       attribute_set = generic.GenericRelation(Attribute, content_type_field='entity_content_type', object_id_field='entity_object_id')
+       attribute_set = generic.GenericRelation(Attribute, content_type_field='entity_content_type', object_id_field='entity_object_id', related_name='%(app_label)s_%(class)s_set')
        
        def get_attribute_mapper(self, mapper=AttributeMapper):
                """

diff --git a/philo/models/nodes.py b/philo/models/nodes.py
index 647ba81..604e958 100644 (file)
--- a/philo/models/nodes.py
+++ b/philo/models/nodes.py
@@ -424,4 +424,5 @@ class File(View):
                return self.name
 
 
-register_value_model(Node)
\ No newline at end of file
+register_value_model(Node)
+register_value_model(File)
\ No newline at end of file