aa

MingMingWu · MingMingWu · commit 7820ce273c7d · 2017-11-02T00:28:44.000+08:00
diff --git a/learning_logs/admin.py b/learning_logs/admin.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 from django.contrib import admin
-from learning_logs.models import Topic
+from learning_logs.models import *
 
 # Register your models here.
 admin.site.register(Topic)
+admin.site.register(MergeBranchSource)
+admin.site.register(BranchSource)
diff --git a/learning_logs/apps.py b/learning_logs/apps.py
@@ -2,7 +2,11 @@
 from __future__ import unicode_literals
 
 from django.apps import AppConfig
-
+from models import *
 
 class LearningLogsConfig(AppConfig):
     name = 'learning_logs'
+
+    def ready(self):
+        a = MergeBranchSource.objects.get(project_name='sfd')
+        
diff --git a/learning_logs/models.py b/learning_logs/models.py
@@ -5,6 +5,16 @@
 
 
 # Create your models here.
+class BranchSource(models.Model):
+    source_id = models.IntegerField(default=None)
+    using = models.NullBooleanField(default=False)
+    project = models.OneToOneField('MergeBranchSource',on_delete=models.CASCADE, related_name='source', default=None)
+
+
+class MergeBranchSource(models.Model):
+    project_name = models.CharField(max_length=20, default=None)
+    # source = models.ForeignKey(BranchSource, on_delete=models.CASCADE, related_name='project')
+
 class Topic(models.Model):
     """用户学习的主题"""
     text = models.CharField(max_length=20)
@@ -16,3 +26,5 @@ def __unicode__(self):
 
 
 
+
+
