Ticket #858: 0002-fixes-to-blog-url-generation.patch

mediagoblin/media_types/blog/lib.py

@@ -45 +45 @@
             blog_posts_list.append(blog_post)
     blog_posts_list.reverse()
     return blog_posts_list
-    
+
+def get_blog_by_slug(request, slug, **kwargs):
+    if slug.startswith('blog_'):
+        blog_id = int(slug[5:])
+        blog = request.db.Blog.query.filter_by(id=blog_id, **kwargs).first()
+    else:
+        blog = request.db.Blog.query.filter_by(slug=slug, **kwargs).first()
+    return blog
  

mediagoblin/media_types/blog/models.py

@@ -34 +34 @@
     def check_slug_used(self, slug):
         return check_blog_slug_used(self.author, slug, self.id)
 
+
 class Blog(Base, BlogMixin):
     __tablename__ = "mediatype__blogs"
     id = Column(Integer, primary_key=True)
@@ -42 +43 @@
     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)
-    
+
+    @property
+    def slug_or_id(self):
+        return (self.slug or u'blog_{0}'.format(self.id))
  
     def get_all_blog_posts(self, state=None):
         blog_posts = Session.query(MediaEntry).join(BlogPostData)\

mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html

@@ -59 +59 @@
     <br/>
     <br/>
     {% set blog_about_url = request.urlgen('mediagoblin.media_types.blog.blog_about', 
-                                      blog_slug=blog.slug, user=blog_owner_name) %}
+                                      blog_slug=blog.slug_or_id, user=blog_owner_name) %}
     <a style="text-decoration:underline" href="{{ blog_about_url}}">About Blog</a>
     <br/>
     {{ render_pagination(request, pagination) }}

mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html

@@ -32 +32 @@
         <table id="blogs_list">
             {% for blog in blogs %}
                 {% set others_blog_url = request.urlgen('mediagoblin.media_types.blog.blog_post_listing',
-                                                  blog_slug=blog.slug, user=user.username) %}
+                                                  blog_slug=blog.slug_or_id, user=user.username) %}
                 
                 <tr>
                      {% if not request.user or request.user.username != user.username%}
                             <td><a href="{{ others_blog_url }}">{{ blog.title }}</a></td>
                      {% else %}
                        {% set my_blog_url = request.urlgen('mediagoblin.media_types.blog.blog-dashboard',
-                       blog_slug=blog.slug, user=request.user.username) %}
+                       blog_slug=blog.slug_or_id, user=request.user.username) %}
                             <td><a href="{{ my_blog_url }}">{{ blog.title }}</a></td>
                      {% endif %}
                      <td>&nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp;</td>

mediagoblin/media_types/blog/views.py

@@ -26 +26 @@
 
 from mediagoblin.media_types.blog import forms as blog_forms
 from mediagoblin.media_types.blog.models import Blog, BlogPostData
-from mediagoblin.media_types.blog.lib import may_edit_blogpost, set_blogpost_state, get_all_blogposts_of_blog
+from mediagoblin.media_types.blog.lib import (
+        may_edit_blogpost, set_blogpost_state, get_all_blogposts_of_blog,
+        get_blog_by_slug)
 
 from mediagoblin.messages import add_message, SUCCESS, ERROR
 from mediagoblin.decorators import (require_active_login, active_user_from_url,
@@ -91 +93 @@
 
     #Blog already exists.
     else:
-        blog = request.db.Blog.query.filter_by(slug=blog_slug).first()
+        blog = get_blog_by_slug(request, blog_slug)
         if not blog:
             return render_404(request)
         if request.method == 'GET':
@@ -129 +131 @@
 
     if request.method == 'POST' and form.validate():
         blog_slug = request.matchdict.get('blog_slug')
-        blog = request.db.Blog.query.filter_by(slug=blog_slug,
-            author=request.user.id).first()
+        blog = get_blog_by_slug(request, blog_slug, author=request.user.id)
         if not blog:
             return render_404(request)
 
@@ -173 +174 @@
     blog_post_slug = request.matchdict.get('blog_post_slug', None)
 
     blogpost = request.db.MediaEntry.query.filter_by(slug=blog_post_slug, uploader=request.user.id).first()
-    blog = request.db.Blog.query.filter_by(slug=blog_slug, author=request.user.id).first()
+    blog = get_blog_by_slug(request, blog_slug, author=request.user.id)
 
     if not blogpost or not blog:
         return render_404(request)
@@ -222 +223 @@
     max_blog_count = config['max_blog_count']
     if request.user and (request.user.id == url_user.id or request.user.has_privilege(u'admin')):
         if blog_slug:
-            blog = blogs.filter(Blog.slug==blog_slug).first()
+            blog = get_blog_by_slug(request, blog_slug)
             if not blog:
                 return render_404(request)
             else:
@@ -259 +260 @@
     Page, listing all the blog posts of a particular blog.
     """
     blog_slug = request.matchdict.get('blog_slug', None)
-    blog = request.db.Blog.query.filter_by(slug=blog_slug).first()
+    blog = get_blog_by_slug(request, blog_slug, author=request.user.id)
     if not blog:
         return render_404(request)
 
@@ -280 +281 @@
 
 @require_active_login
 def draft_view(request):
-    
     blog_slug = request.matchdict.get('blog_slug', None)
     blog_post_slug = request.matchdict.get('blog_post_slug', None)
     user = request.matchdict.get('user')
-
-    blog = request.db.Blog.query.filter_by(author=request.user.id, slug=blog_slug).first()
+    blog = get_blog_by_slug(request, blog_slug, author=request.user.id)
     blogpost = request.db.MediaEntry.query.filter_by(state = u'failed', uploader=request.user.id, slug=blog_post_slug).first()
 
     if not blog or not blogpost:
@@ -308 +307 @@
     owner_user = request.db.User.query.filter_by(username=url_user).first()
 
     blog_slug = request.matchdict.get('blog_slug', None)
-    blog = request.db.Blog.query.filter_by(slug=blog_slug, author=owner_user.id).first()
+    blog = get_blog_by_slug(request, blog_slug, author=owner_user.id)
     if not blog:
         return render_404(reequest)
 
@@ -355 +354 @@
     url_user = request.matchdict.get('user', None)
     
     user = request.db.User.query.filter_by(username=url_user).first() 
-    blog = request.db.Blog.query.filter_by(author=user.id, slug=blog_slug).first()
+    blog = get_blog_by_slug(request, blog_slug, author=user.id)
     
     if not user or not blog:
         return render_404(request)