1
=== modified file 'logger/models.py'
2
--- logger/models.py	2010-10-18 19:22:47 +0000
3
+++ logger/models.py	2010-11-28 21:05:12 +0000
4
@@ -16,3 +16,8 @@
5
16
    manifestation = models.CharField(max_length=255)
16
    manifestation = models.CharField(max_length=255)
6
17
    actor = models.CharField(max_length=255)
17
    actor = models.CharField(max_length=255)
7
18
    subject = models.ForeignKey(Subject)
18
    subject = models.ForeignKey(Subject)
8
19
9
20
class Metadata(models.Model):
10
21
    eventid = models.ForeignKey(Event)
11
22
    name = models.CharField(max_length=255)
12
23
    value = models.CharField(max_length=255)
13
19
24
14
=== added directory 'music'
15
=== added file 'music/__init__.py'
16
=== added file 'music/models.py'
17
--- music/models.py	1970-01-01 00:00:00 +0000
18
+++ music/models.py	2010-11-28 21:05:12 +0000
19
@@ -0,0 +1,14 @@
20
1
from django.db import models
21
2
from affinity.logger import models as EventModel
22
3
23
4
# Create your models here.
24
5
25
6
class Music(models.Model):
26
7
    event = models.ForeignKey(EventModel.Event)
27
8
    title = models.CharField(max_length=255)
28
9
    artist = models.CharField(max_length=255)
29
10
    album = models.CharField(max_length=255)
30
11
    year = models.BigIntegerField()
31
12
    comment = models.CharField(max_length=255)
32
13
    track = models.CharField(max_length=255)
33
14
    genre = models.CharField(max_length=255)
34
0
15
35
=== added file 'music/tests.py'
36
--- music/tests.py	1970-01-01 00:00:00 +0000
37
+++ music/tests.py	2010-11-28 21:05:12 +0000
38
@@ -0,0 +1,23 @@
39
1
"""
40
2
This file demonstrates two different styles of tests (one doctest and one
41
3
unittest). These will both pass when you run "manage.py test".
42
4
43
5
Replace these with more appropriate tests for your application.
44
6
"""
45
7
46
8
from django.test import TestCase
47
9
48
10
class SimpleTest(TestCase):
49
11
    def test_basic_addition(self):
50
12
        """
51
13
        Tests that 1 + 1 always equals 2.
52
14
        """
53
15
        self.failUnlessEqual(1 + 1, 2)
54
16
55
17
__test__ = {"doctest": """
56
18
Another way to test that 1 + 1 is equal to 2.
57
19
58
20
>>> 1 + 1 == 2
59
21
True
60
22
"""}
61
23
62
0
24
63
=== added file 'music/urls.py'
64
--- music/urls.py	1970-01-01 00:00:00 +0000
65
+++ music/urls.py	2010-11-28 21:05:12 +0000
66
@@ -0,0 +1,8 @@
67
1
from django.conf.urls.defaults import *
68
2
from piston.resource import Resource
69
3
70
4
urlpatterns = patterns('affinity.music.views',
71
5
    # Example:
72
6
    (r'^$', 'index'),
73
7
    #(r'^music$', Resource(EventHandler)),
74
8
)
75
0
9
76
=== added file 'music/views.py'
77
--- music/views.py	1970-01-01 00:00:00 +0000
78
+++ music/views.py	2010-11-28 21:05:12 +0000
79
@@ -0,0 +1,6 @@
80
1
# Create your views here.
81
2
82
3
from django.http import HttpResponse
83
4
84
5
def index(request):
85
6
    return HttpResponse("Music")
86
0
7
87
=== modified file 'settings.py'
88
--- settings.py	2010-11-24 19:44:28 +0000
89
+++ settings.py	2010-11-28 21:05:12 +0000
90
@@ -90,6 +90,7 @@
91
90
    'django.contrib.sites',
90
    'django.contrib.sites',
92
91
    'django.contrib.messages',
91
    'django.contrib.messages',
93
92
    'affinity.logger',
92
    'affinity.logger',
94
93
    'affinity.music',
95
93
    # Uncomment the next line to enable the admin:
94
    # Uncomment the next line to enable the admin:
96
94
    'django.contrib.admin',
95
    'django.contrib.admin',
97
95
    # Uncomment the next line to enable admin documentation:
96
    # Uncomment the next line to enable admin documentation:
98
96
97
99
=== modified file 'urls.py'
100
--- urls.py	2010-10-18 19:22:47 +0000
101
+++ urls.py	2010-11-28 21:05:12 +0000
102
@@ -5,8 +5,8 @@
103
5
admin.autodiscover()
5
admin.autodiscover()
104
6
6
105
7
urlpatterns = patterns('',
7
urlpatterns = patterns('',
106
8
    # Example:
107
9
    (r'^log/', include('logger.urls')),
8
    (r'^log/', include('logger.urls')),
108
9
    (r'^music/', include('music.urls')),
109
10
10
110
11
    # Uncomment the admin/doc line below to enable admin documentation:
11
    # Uncomment the admin/doc line below to enable admin documentation:
111
12
    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
12
    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
Status:	Merged
Merged at revision:	10
Proposed branch:	lp:~manishsinha/zeitgeist-affinity/add-music-skeleton
Merge into:	lp:zeitgeist-affinity
Diff against target:	111 lines (+58/-1) 7 files modified logger/models.py (+5/-0) music/models.py (+14/-0) music/tests.py (+23/-0) music/urls.py (+8/-0) music/views.py (+6/-0) settings.py (+1/-0) urls.py (+1/-1)
To merge this branch:	bzr merge lp:~manishsinha/zeitgeist-affinity/add-music-skeleton
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jamal Fanaian		2010-11-28	Approve on 2010-11-28
Review via email: mp+42060@code.launchpad.net