--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hashcut/admin.py	Thu Nov 29 13:19:38 2012 +0100
@@ -0,0 +1,5 @@
+from django.contrib import admin
+from hashcut.models import Branding, Mashup
+
+admin.site.register(Branding)
+admin.site.register(Mashup)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hashcut/migrations/0001_branding_iri_bpi.py	Thu Nov 29 13:19:38 2012 +0100
@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Write your forwards methods here."
+        # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..."
+        br_iri = orm['hashcut.branding']()
+        br_iri.name = "iri"
+        br_iri.save()
+        br_bpi = orm['hashcut.branding']()
+        br_bpi.name = "bpi"
+        br_bpi.save()
+        
+
+    def backwards(self, orm):
+        "Write your backwards methods here."
+
+    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'})
+        },
+        'hashcut.branding': {
+            'Meta': {'object_name': 'Branding'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'hashcut.mashup': {
+            'Meta': {'object_name': 'Mashup'},
+            'branding': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hashcut.Branding']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ldt_utils.Project']", 'null': 'True'})
+        },
+        'ldt_utils.author': {
+            'Meta': {'object_name': 'Author'},
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'handle': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'ldt_utils.content': {
+            'Meta': {'ordering': "['title']", 'object_name': 'Content'},
+            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ldt_utils.Author']", 'symmetrical': 'False', 'blank': 'True'}),
+            'content_creation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'duration': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'front_project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ldt_utils.Project']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('sorl.thumbnail.fields.ImageField', [], {'default': "'thumbnails/contents/content_default_icon.png'", 'max_length': '200'}),
+            'iri_id': ('django.db.models.fields.CharField', [], {'default': "u'47f68d1e-3a16-11e2-b6b6-c8bcc896c290'", 'unique': 'True', 'max_length': '255'}),
+            'iriurl': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'media_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ldt_utils.Media']", 'null': 'True', 'blank': 'True'}),
+            'tags': ('tagging.fields.TagField', [], {'max_length': '2048', 'null': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'update_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'ldt_utils.media': {
+            'Meta': {'object_name': 'Media'},
+            'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'duration': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'external_id': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'external_permalink': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'external_publication_url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'external_src_url': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'media_creation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'mimetype_field': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'src': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'src_hash': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'update_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'videopath': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'})
+        },
+        'ldt_utils.project': {
+            'Meta': {'ordering': "['title']", 'object_name': 'Project'},
+            'changed_by': ('django.db.models.fields.CharField', [], {'max_length': '70'}),
+            'contents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ldt_utils.Content']", 'symmetrical': 'False'}),
+            'created_by': ('django.db.models.fields.CharField', [], {'max_length': '70'}),
+            'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('sorl.thumbnail.fields.ImageField', [], {'default': "'thumbnails/projects/project_default_icon.png'", 'max_length': '200'}),
+            'ldt': ('django.db.models.fields.TextField', [], {'null': 'True'}),
+            'ldt_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'modification_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'state': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '1024'})
+        }
+    }
+
+    complete_apps = ['hashcut']
+    symmetrical = True

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hashcut/models.py	Thu Nov 29 13:19:38 2012 +0100
@@ -0,0 +1,31 @@
+from django.db import models
+from django.db.models import Model
+from ldt.ldt_utils.models import Project
+
+
+class Branding(Model):
+
+    name = models.CharField(max_length=255, unique=True, blank=True, null=True)
+    
+    def __unicode__(self):
+        return unicode(self.id) + u"::" + unicode(self.name)
+    
+    
+class Mashup(Model):
+    
+    project = models.ForeignKey(Project, null=True)
+    branding = models.ForeignKey(Branding)
+    
+    def __unicode__(self):
+        return unicode(self.id) + u"::" + unicode(self.branding.name) + u"::" + unicode(self.project.ldt_id)
+    
+    def creator(): #@NoSelf
+        def fget(self):
+            if self.project is not None:
+                return self.project.owner
+            else:
+                return None
+        return locals()
+    
+    creator = property(**creator())
+    
\ No newline at end of file

--- a/src/hashcut/templates/bpi_mashup_edit.html	Wed Nov 28 19:23:39 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_edit.html	Thu Nov 29 13:19:38 2012 +0100
@@ -262,7 +262,8 @@
 <script type="text/javascript">
     IriSP.endpoints = {
         content: "{% url api_dispatch_list api_name='1.0' resource_name='contents' %}",
-        project: "{% url api_dispatch_list api_name='1.0' resource_name='projects' %}",
+        //project: "{% url api_dispatch_list api_name='1.0' resource_name='projects' %}",
+        project: "{% url mashup_save branding=branding %}",
         segment: "{% url api_dispatch_list api_name='1.0' resource_name='segments' %}",
         ldt: "{% url projectjson_id id='' %}",
         hashcut_page: "{% url mashup_hashcut branding=branding ldt_id='' %}"

--- a/src/hashcut/templates/iri_mashup_edit.html	Wed Nov 28 19:23:39 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_edit.html	Thu Nov 29 13:19:38 2012 +0100
@@ -262,7 +262,8 @@
 <script type="text/javascript">
     IriSP.endpoints = {
         content: "{% url api_dispatch_list api_name='1.0' resource_name='contents' %}",
-        project: "{% url api_dispatch_list api_name='1.0' resource_name='projects' %}",
+        //project: "{% url api_dispatch_list api_name='1.0' resource_name='projects' %}",
+        project: "{% url mashup_save branding=branding %}",
         segment: "{% url api_dispatch_list api_name='1.0' resource_name='segments' %}",
         ldt: "{% url projectjson_id id='' %}",
         hashcut_page: "{% url mashup_hashcut branding=branding ldt_id='' %}"

--- a/src/hashcut/urls.py	Wed Nov 28 19:23:39 2012 +0100
+++ b/src/hashcut/urls.py	Thu Nov 29 13:19:38 2012 +0100
@@ -3,6 +3,7 @@
 
 urlpatterns = patterns('',
     url(r'^(?P<branding>.*)/edit/$', MashupEdit.as_view(), name="mashup_edit"),
+    url(r'^(?P<branding>.*)/save/$', 'hashcut.views.save_mashup', name="mashup_save"),
     url(r'^(?P<branding>.*)/hashcut/(?P<ldt_id>.*)/$', MashupHashcut.as_view(), name="mashup_hashcut"),
     url(r'^(?P<branding>.*)/media/(?P<ctt_id>.*)/$', MashupContent.as_view(), name="mashup_content"),
     url(r'^(?P<branding>.*)/$', MashupHome.as_view(), name="mashup_home"),

--- a/src/hashcut/views.py	Wed Nov 28 19:23:39 2012 +0100
+++ b/src/hashcut/views.py	Thu Nov 29 13:19:38 2012 +0100
@@ -1,8 +1,10 @@
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 from django.http import HttpResponseNotFound
 from django.views.generic.base import View, TemplateResponseMixin
+from ldt.api.ldt.resources import ProjectResource
 from ldt.ldt_utils.models import Project
 import logging
+from hashcut.models import Mashup, Branding
 
 
 class MashupHome(TemplateResponseMixin, View):
@@ -68,6 +70,35 @@
         self.branding = branding
         context = {"branding":self.branding, "creator":request.user.username}
         return self.render_to_response(context)
+
+
+def save_mashup(request, branding="iri"):
+    # First we use the project api to save the project
+    logging.debug("save_mashup 1")
+    proj_api = ProjectResource()
+    logging.debug("save_mashup 2 " + repr(proj_api))
+    rtrn = proj_api.dispatch_list(request)
+    logging.debug("save_mashup 3 " + repr(rtrn))
+    if rtrn and rtrn['Location']:
+        logging.debug("save_mashup 4 " + rtrn['Location'])
+        # The api return the api location of the created project (i.e. /a/b/ldt_id/). So we just get the id to get the project object.
+        proj_ldt_id = rtrn['Location'].split("/")[-2]
+        logging.debug("save_mashup 5 proj_ldt_id = " + proj_ldt_id)
+        proj = None
+        try:
+            proj = Project.objects.get(ldt_id=proj_ldt_id)
+        except Project.DoesNotExist:
+            raise ObjectDoesNotExist("Save Mashup : project not found. project_ldt_id = " + proj_ldt_id)
+        # Now that we have the project object, we can save the mashup object
+        brd = Branding.objects.get(name=branding)
+        logging.debug("save_mashup 6" + repr(brd))
+        new_mashup = Mashup()
+        new_mashup.branding = brd
+        new_mashup.project = proj
+        logging.debug("save_mashup 7 new_mashup = " + repr(new_mashup))
+        new_mashup.save()
+        logging.debug("save_mashup 8")
+    return rtrn