diff options
| author | Vijeth Aradhya <vijthaaa@gmail.com> | 2017-08-14 12:08:36 +0000 |
|---|---|---|
| committer | Vijeth Aradhya <vijthaaa@gmail.com> | 2017-08-14 12:08:36 +0000 |
| commit | 2bb617fa9e3f9cf1a6171654bf985c40951741b6 (patch) | |
| tree | 1badeda7fc4a0597f37b4c66260ae3317150e0d2 /mediagoblin/media_types | |
| parent | 91a7b1226cb95a8d61f7cc19be56ae472289639c (diff) | |
| parent | 1f8c877d7430c1101740ef6ee732e90ff4c9cfdc (diff) | |
| download | mediagoblin-2bb617fa9e3f9cf1a6171654bf985c40951741b6.tar.lz mediagoblin-2bb617fa9e3f9cf1a6171654bf985c40951741b6.tar.xz mediagoblin-2bb617fa9e3f9cf1a6171654bf985c40951741b6.zip | |
Merge branch 'master' into 'multiple-qualities-frontend'
Add multiple video qualities feature
See merge request !2
Diffstat (limited to 'mediagoblin/media_types')
3 files changed, 7 insertions, 5 deletions
diff --git a/mediagoblin/media_types/blog/models.py b/mediagoblin/media_types/blog/models.py index 0e1ddf97..83f520c7 100644 --- a/mediagoblin/media_types/blog/models.py +++ b/mediagoblin/media_types/blog/models.py @@ -34,6 +34,7 @@ class BlogMixin(GenerateSlugMixin): def check_slug_used(self, slug): return check_blog_slug_used(self.author, slug, self.id) +BLOG_BACKREF_NAME = "mediatype__blogs" class Blog(Base, BlogMixin): __tablename__ = "mediatype__blogs" @@ -43,6 +44,7 @@ class Blog(Base, BlogMixin): author = Column(Integer, ForeignKey(User.id), nullable=False, index=True) #similar to uploader created = Column(DateTime, nullable=False, default=datetime.datetime.now, index=True) slug = Column(Unicode) + get_author = relationship("User", backref=backref(BLOG_BACKREF_NAME, cascade="all, delete-orphan")) @property def slug_or_id(self): @@ -66,7 +68,7 @@ class Blog(Base, BlogMixin): -BACKREF_NAME = "blogpost__media_data" +BLOG_POST_BACKREF_NAME = "blogpost__media_data" class BlogPostData(Base): __tablename__ = "blogpost__mediadata" @@ -75,7 +77,7 @@ class BlogPostData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) blog = Column(Integer, ForeignKey('mediatype__blogs.id'), nullable=False) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, uselist=False, + backref=backref(BLOG_POST_BACKREF_NAME, uselist=False, cascade="all, delete-orphan")) diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html index 3b881466..97408b59 100644 --- a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html +++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html @@ -53,7 +53,7 @@ {% set blog_delete_url = request.urlgen('mediagoblin.media_types.blog.blog_delete', blog_slug=blog.slug, user=request.user.username) %} -<a class="button_action" href="{{ blog_delete_url }}"> +<a class="button_action button_warning" href="{{ blog_delete_url }}"> {%- trans %}Delete Blog{% endtrans -%} </a> </p> @@ -90,7 +90,7 @@ media_id=blog_post.id) %} <td> <a class="button_action" href="{{ blogpost_edit_url }}">{% trans %}Edit{% endtrans %}</a> - <a class="button_action" href="{{ blogpost_delete_url }}">{% trans %}Delete{% endtrans %}</a> + <a class="button_action button_warning" href="{{ blogpost_delete_url }}">{% trans %}Delete{% endtrans %}</a> </td> </tr> {% endfor %} diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html index 6d820550..7a53cc9e 100644 --- a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html +++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html @@ -33,7 +33,7 @@ user= blogpost.get_actor.username, media_id=blogpost.id) %} <a class="button_action" href="{{ blogpost_edit_url }}">{% trans %}Edit{% endtrans %}</a> - <a class="button_action" href="{{ blogpost_delete_url }}">{% trans %}Delete{% endtrans %}</a> + <a class="button_action button_warning" href="{{ blogpost_delete_url }}">{% trans %}Delete{% endtrans %}</a> {% endblock %} |