Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.contrib import admin
from lead_center.models import Campaign, Lead
from dev_center.models import Campaign, Dev

admin.site.register(Campaign);
admin.site.register(Lead);
admin.site.register(Dev);
# Register your models here.
19 changes: 10 additions & 9 deletions karinacms/lead_center/forms.py → karinacms/dev_center/forms.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django import forms
from django.contrib.auth.models import User
from .models import Lead, Campaign, LeadComment, LeadStatus, UserInfo, Product
from .models import Dev, Campaign, DevComment, DevStatus, UserInfo, Product

class BootstrapForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
Expand Down Expand Up @@ -31,9 +31,9 @@ class Meta:
model = Campaign
fields = ('name', 'description',)

class LeadStatusForm(BootstrapForm):
class DevStatusForm(BootstrapForm):
class Meta:
model = LeadStatus
model = DevStatus
fields = ('name', 'description',)

class UserLoginForm(BootstrapForm):
Expand All @@ -43,22 +43,23 @@ class Meta:
model = User
fields = ('username', 'password',)

class LeadForm(BootstrapForm):
class DevForm(BootstrapForm):
class Meta:
model = Lead
model = Dev
fields = ('first_name', 'last_name', 'city', 'phone',
'email', 'comment', 'status', 'campaign', 'product')
'email', 'comment', 'status', 'campaign', 'product',
'asana', 'github', 'slack')


class leadCommentForm(BootstrapForm):
class DevCommentForm(BootstrapForm):
title = forms.CharField(max_length=512, help_text="Summary of the call")
comment = forms.CharField(max_length=1024, widget=forms.Textarea, help_text="Description of the call")
def __init__(self, *args, **kwargs):
super(leadCommentForm, self).__init__(*args, **kwargs)
super(DevCommentForm, self).__init__(*args, **kwargs)
self.fields['title'].widget.attrs['class'] = 'form-control'
self.fields['comment'].widget.attrs['class'] = 'form-control'
class Meta:
model = LeadComment
model = DevComment
fields = ('title', 'comment',)


Original file line number Diff line number Diff line change
Expand Up @@ -9,86 +9,89 @@ class Migration(SchemaMigration):

def forwards(self, orm):
# Adding model 'UserInfo'
db.create_table(u'lead_center_userinfo', (
db.create_table(u'dev_center_userinfo', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
('site', self.gf('django.db.models.fields.URLField')(max_length=200, blank=True)),
))
db.send_create_signal(u'lead_center', ['UserInfo'])
db.send_create_signal(u'dev_center', ['UserInfo'])

# Adding model 'Campaign'
db.create_table(u'lead_center_campaign', (
db.create_table(u'dev_center_campaign', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
('description', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)),
('view', self.gf('django.db.models.fields.CharField')(max_length=50, blank=True)),
))
db.send_create_signal(u'lead_center', ['Campaign'])
db.send_create_signal(u'dev_center', ['Campaign'])

# Adding model 'Product'
db.create_table(u'lead_center_product', (
db.create_table(u'dev_center_product', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
('description', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)),
))
db.send_create_signal(u'lead_center', ['Product'])
db.send_create_signal(u'dev_center', ['Product'])

# Adding model 'LeadStatus'
db.create_table(u'lead_center_leadstatus', (
# Adding model 'DevStatus'
db.create_table(u'dev_center_devstatus', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
('description', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)),
))
db.send_create_signal(u'lead_center', ['LeadStatus'])
db.send_create_signal(u'dev_center', ['DevStatus'])

# Adding model 'Lead'
db.create_table(u'lead_center_lead', (
# Adding model 'Dev'
db.create_table(u'dev_center_dev', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('campaign', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['lead_center.Campaign'], null=True)),
('product', self.gf('django.db.models.fields.related.ForeignKey')(related_name='product_leads', null=True, to=orm['lead_center.Product'])),
('status', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['lead_center.LeadStatus'], null=True)),
('campaign_url', self.gf('django.db.models.fields.CharField')(max_length=100, null=True)),
('campaign', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='campaign_devs', null=True, to=orm['dev_center.Campaign'])),
('product', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='product_devs', null=True, to=orm['dev_center.Product'])),
('status', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='status_devs', null=True, to=orm['dev_center.DevStatus'])),
('campaign_url', self.gf('django.db.models.fields.CharField')(max_length=100, blank=True)),
('phone', self.gf('django.db.models.fields.CharField')(max_length=15)),
('email', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),
('asana', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),
('github', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),
('slack', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),
('first_name', self.gf('django.db.models.fields.CharField')(max_length=40)),
('last_name', self.gf('django.db.models.fields.CharField')(max_length=40)),
('city', self.gf('django.db.models.fields.CharField')(max_length=50, null=True)),
('city', self.gf('django.db.models.fields.CharField')(max_length=50, blank=True)),
('comment', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
('ip', self.gf('django.db.models.fields.CharField')(max_length=30, null=True)),
('agent', self.gf('django.db.models.fields.CharField')(max_length=60, null=True)),
('ip', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
('agent', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),
))
db.send_create_signal(u'lead_center', ['Lead'])
db.send_create_signal(u'dev_center', ['Dev'])

# Adding model 'LeadComment'
db.create_table(u'lead_center_leadcomment', (
# Adding model 'DevComment'
db.create_table(u'dev_center_devcomment', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('lead', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['lead_center.Lead'])),
('dev', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dev_center.Dev'])),
('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
('title', self.gf('django.db.models.fields.CharField')(max_length=512)),
('comment', self.gf('django.db.models.fields.TextField')(max_length=1024)),
('time', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
))
db.send_create_signal(u'lead_center', ['LeadComment'])
db.send_create_signal(u'dev_center', ['DevComment'])


def backwards(self, orm):
# Deleting model 'UserInfo'
db.delete_table(u'lead_center_userinfo')
db.delete_table(u'dev_center_userinfo')

# Deleting model 'Campaign'
db.delete_table(u'lead_center_campaign')
db.delete_table(u'dev_center_campaign')

# Deleting model 'Product'
db.delete_table(u'lead_center_product')
db.delete_table(u'dev_center_product')

# Deleting model 'LeadStatus'
db.delete_table(u'lead_center_leadstatus')
# Deleting model 'DevStatus'
db.delete_table(u'dev_center_devstatus')

# Deleting model 'Lead'
db.delete_table(u'lead_center_lead')
# Deleting model 'Dev'
db.delete_table(u'dev_center_dev')

# Deleting model 'LeadComment'
db.delete_table(u'lead_center_leadcomment')
# Deleting model 'DevComment'
db.delete_table(u'dev_center_devcomment')


models = {
Expand Down Expand Up @@ -128,56 +131,59 @@ def backwards(self, orm):
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
u'lead_center.campaign': {
u'dev_center.campaign': {
'Meta': {'object_name': 'Campaign'},
'description': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'view': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'})
},
u'lead_center.lead': {
'Meta': {'object_name': 'Lead'},
'agent': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True'}),
'campaign': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['lead_center.Campaign']", 'null': 'True'}),
'campaign_url': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True'}),
u'dev_center.dev': {
'Meta': {'object_name': 'Dev'},
'agent': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
'asana': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
'campaign': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'campaign_devs'", 'null': 'True', 'to': u"orm['dev_center.Campaign']"}),
'campaign_url': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'email': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
'github': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'ip': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
'ip': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
'phone': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'product_leads'", 'null': 'True', 'to': u"orm['lead_center.Product']"}),
'status': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['lead_center.LeadStatus']", 'null': 'True'})
'product': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'product_devs'", 'null': 'True', 'to': u"orm['dev_center.Product']"}),
'slack': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
'status': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'status_devs'", 'null': 'True', 'to': u"orm['dev_center.DevStatus']"})
},
u'lead_center.leadcomment': {
'Meta': {'object_name': 'LeadComment'},
u'dev_center.devcomment': {
'Meta': {'object_name': 'DevComment'},
'comment': ('django.db.models.fields.TextField', [], {'max_length': '1024'}),
'dev': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['dev_center.Dev']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'lead': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['lead_center.Lead']"}),
'time': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
},
u'lead_center.leadstatus': {
'Meta': {'object_name': 'LeadStatus'},
u'dev_center.devstatus': {
'Meta': {'object_name': 'DevStatus'},
'description': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
},
u'lead_center.product': {
u'dev_center.product': {
'Meta': {'object_name': 'Product'},
'description': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
},
u'lead_center.userinfo': {
u'dev_center.userinfo': {
'Meta': {'object_name': 'UserInfo'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'site': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
}
}

complete_apps = ['lead_center']
complete_apps = ['dev_center']
17 changes: 10 additions & 7 deletions karinacms/lead_center/models.py → karinacms/dev_center/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,22 @@ class Product(models.Model):
def __unicode__(self):
return self.name

class LeadStatus(models.Model):
class DevStatus(models.Model):
name = models.CharField(max_length=255)
description = models.CharField(max_length=512, blank=True)
def __unicode__(self):
return self.name

class Lead(models.Model):
campaign = models.ForeignKey(Campaign, null=True, blank=True, related_name='campaign_leads')
product = models.ForeignKey(Product, null=True, blank=True, related_name='product_leads')
status = models.ForeignKey(LeadStatus, null=True, blank=True, related_name='status_leads')
class Dev(models.Model):
campaign = models.ForeignKey(Campaign, null=True, blank=True, related_name='campaign_devs')
product = models.ForeignKey(Product, null=True, blank=True, related_name='product_devs')
status = models.ForeignKey(DevStatus, null=True, blank=True, related_name='status_devs')
campaign_url = models.CharField(max_length=100, blank=True)
phone = models.CharField(max_length=15)
email = models.CharField(max_length=60, blank=True)
asana = models.CharField(max_length=60, blank=True)
github = models.CharField(max_length=60, blank=True)
slack = models.CharField(max_length=60, blank=True)
first_name = models.CharField(max_length=40)
last_name = models.CharField(max_length=40)
city = models.CharField(max_length=50, blank=True)
Expand All @@ -46,8 +49,8 @@ def name(self):
def __unicode__(self):
return '%s %s' % (self.first_name, self.last_name)

class LeadComment(models.Model):
lead = models.ForeignKey(Lead)
class DevComment(models.Model):
dev = models.ForeignKey(Dev)
user = models.ForeignKey(User)
title = models.CharField(max_length=512, null=False)
comment = models.TextField(max_length=1024, null=False)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from .models import Lead
from .models import Dev
from rest_framework import serializers

class LeadSerializer(serializers.HyperlinkedModelSerializer):
class DevSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = Lead
model = Dev
fields = ('first_name', 'last_name', 'phone',)
File renamed without changes.
23 changes: 23 additions & 0 deletions karinacms/dev_center/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
from django.conf.urls import patterns, include, url

from django.contrib import admin
from dev_center import views
admin.autodiscover()

urlpatterns = patterns('',
url(r'^$', 'dev_center.views.index', name='index'),
# url(r'^about/', 'dev_center.views.about', name='about'),
url(r'^add_dev/(?P<campaign_name>.+)?', 'dev_center.views.dev_form', name='add_dev'),
url(r'^edit_dev/(?P<dev_id>\d+)/$', 'dev_center.views.dev_edit_form', name='edit_dev'),
url(r'^dev_page/(?P<dev_name>.+)?', 'dev_center.views.dev_page', name='dev_page'),
url(r'^products/', 'dev_center.views.product_list', name='product_list'),
url(r'^campaigns/', 'dev_center.views.campaign_list', name='campaign_list'),
url(r'^statuses/', 'dev_center.views.status_list', name='status_list'),
# url(r'^blog/', includedev_center('blog.urls')),
url(r'^register/', 'dev_center.views.register', name='register'),#TODO: remove those paths to the root urls.py
url(r'^login/', 'dev_center.views.user_login', name='login'),
url(r'^logout/', 'dev_center.views.user_logout', name='logout'),
url(r'^search_list/$', 'dev_center.views.search_list', name='search_list'),
url(r'^edit/(?P<obj_type>.+)/(?P<obj_id>\d+)$', 'dev_center.views.edit_obj', name='edit_obj'), #url(r'^admin/', include(admin.site.urls)),
url(r'^delete/(?P<obj_type>.+)/(?P<obj_id>\d+)$', 'dev_center.views.delete_obj', name='delete_obj'),
)
Loading