diff options
Diffstat (limited to 'stapp')
| -rw-r--r-- | stapp/templates/video/list_videos.html | 4 | ||||
| -rw-r--r-- | stapp/video/migrations/0003_auto__add_field_video_created.py | 40 | ||||
| -rw-r--r-- | stapp/video/views.py | 8 |
3 files changed, 44 insertions, 8 deletions
diff --git a/stapp/templates/video/list_videos.html b/stapp/templates/video/list_videos.html index 6afa596..aebcc17 100644 --- a/stapp/templates/video/list_videos.html +++ b/stapp/templates/video/list_videos.html @@ -14,8 +14,8 @@ {% block video %} <video width="700" height="400" controls="controls"> - <source src="{{play.video_file.url}}"> - </video> {{ play.id }} + <source src="{{play.filename.url}}"> + </video> diff --git a/stapp/video/migrations/0003_auto__add_field_video_created.py b/stapp/video/migrations/0003_auto__add_field_video_created.py new file mode 100644 index 0000000..92f9584 --- /dev/null +++ b/stapp/video/migrations/0003_auto__add_field_video_created.py @@ -0,0 +1,40 @@ +# -*- coding: 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 'Video.created' + db.add_column('video_video', 'created', + self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2012, 6, 18, 0, 0), blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Video.created' + db.delete_column('video_video', 'created') + + + models = { + 'video.module': { + 'Meta': {'object_name': 'Module'}, + 'description': ('django.db.models.fields.TextField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'vidio_list': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['video.Video']", 'symmetrical': 'False'}) + }, + 'video.video': { + 'Meta': {'object_name': 'Video'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {}), + 'filename': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}) + } + } + + complete_apps = ['video']
\ No newline at end of file diff --git a/stapp/video/views.py b/stapp/video/views.py index 8361b9f..1db66aa 100644 --- a/stapp/video/views.py +++ b/stapp/video/views.py @@ -3,15 +3,11 @@ from django.template import RequestContext from django.shortcuts import render_to_response, get_object_or_404, redirect from video.models import Video -def show(request,video_id=None): +def show(request): videos = Video.objects.all() if len(videos) == 0 : return HttpResponse("No videos in Database...") - play_video = None - if video_id != None : - play_video = Video.objects.get(id = video_id) - else: - play_video = videos[len(videos)-1] + play_video = Video.objects.latest('created') vids = { 'videos' : videos , 'play' : play_video} return render_to_response('video/list_videos.html', vids) |