Merge branch 'master' of github.com:beetletweezers/tweezers

core/views.py

@@ -8,6 +8,7 @@ from django.views.static import serve
 
 import json
 import os
+import re
 
 from projects.models import Project
 from projects.tasks import update_docs
@@ -47,5 +48,20 @@ def serve_docs(request, username, project_slug, filename):
     return serve(request, filename, proj.full_html_path)
 
 def render_header(request):
-    return render_to_response('core/header.html', {},
+    # try to deconstruct the request url to find the user and project
+    project = None
+
+    path_info = request.META['PATH_INFO']
+    path_match = re.match('/projects/([-\w]+)/([-\w]+)/', path_info)
+    if path_match:
+        user, project_slug = path_match.groups()
+        try:
+            project = Project.objects.get(
+                user__username=user,
+                slug=project_slug
+            )
+        except Project.DoesNotExist:
+            pass
+
+    return render_to_response('core/header.html', {'project': project},
                 context_instance=RequestContext(request))

projects/migrations/0010_add_created_to_rev.py

@@ -0,0 +1,103 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'FileRevision.created_date'
+        db.add_column('projects_filerevision', 'created_date', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2010, 8, 15, 1, 7, 31, 20436), blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'FileRevision.created_date'
+        db.delete_column('projects_filerevision', 'created_date')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'projects.conf': {
+            'Meta': {'object_name': 'Conf'},
+            'copyright': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'project': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'conf'", 'unique': 'True', 'to': "orm['projects.Project']"}),
+            'suffix': ('django.db.models.fields.CharField', [], {'default': "'.rst'", 'max_length': '10'}),
+            'theme': ('django.db.models.fields.CharField', [], {'default': "'default'", 'max_length': '20'})
+        },
+        'projects.file': {
+            'Meta': {'ordering': "('denormalized_path',)", 'object_name': 'File'},
+            'content': ('django.db.models.fields.TextField', [], {}),
+            'denormalized_path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'heading': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ordering': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['projects.File']"}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'files'", 'to': "orm['projects.Project']"}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'})
+        },
+        'projects.filerevision': {
+            'Meta': {'ordering': "('-revision_number',)", 'object_name': 'FileRevision'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'diff': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'file': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': "orm['projects.File']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_reverted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'revision_number': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'projects.project': {
+            'Meta': {'ordering': "('-modified_date', 'name')", 'object_name': 'Project'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'docs_directory': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'pub_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'repo': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects'", 'to': "orm['auth.User']"}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        }
+    }
+
+    complete_apps = ['projects']

projects/models.py

@@ -101,6 +101,10 @@ class Project(models.Model):
             elif self.repo.endswith('git'):
                 return 'git'
 
+    def get_latest_revisions(self):
+        revision_qs = FileRevision.objects.filter(file__project=self)
+        return revision_qs.order_by('-created_date')
+
 
 class Conf(models.Model):
     project = models.OneToOneField(Project, related_name='conf')
@@ -199,6 +203,7 @@ class FileRevision(models.Model):
     file = models.ForeignKey(File, related_name='revisions')
     comment = models.TextField(blank=True)
     diff = models.TextField(blank=True)
+    created_date = models.DateTimeField(auto_now_add=True)
 
     revision_number = models.IntegerField()
     is_reverted = models.BooleanField(default=False)
@@ -207,7 +212,7 @@ class FileRevision(models.Model):
         ordering = ('-revision_number',)
 
     def __unicode__(self):
-        return '%s #%s' % (self.file.heading, self.revision_number)
+        return self.comment or '%s #%s' % (self.file.heading, self.revision_number)
 
     def get_file_content(self):
         """

projects/templates/projects/project_detail.html

@@ -15,6 +15,13 @@
       <li>No tags</li>
     {% endfor %}
   </ul>
+
+  <h3>Latest Revisions</h3>
+  <ul>
+    {% for revision in project.get_latest_revisions|slice:":5" %}
+      <li>{{ revision }} {{ revision.created_date|timesince }} ago</li>
+    {% endfor %}
+  </ul>
   
   <h3>Projects by {{ project.user.username }}</h3>
   <ul>

templates/core/header.html

@@ -20,7 +20,9 @@
         <!-- BEGIN header nav -->
         <div class="rtfd-header-nav">
           <ul>
-
+            {% if project %}
+              <li><a href="{{ project.get_absolute_url }}">Overview</a></li>
+            {% endif %}
             {% if user.is_authenticated %}
               <li {% block nav-dashboard %}{% endblock %}><a href="{% url projects_dashboard %}">Dashboard</a></li>
               <li><a href="{% url auth_logout %}">Log Out</a></li>