Skip to content

Commit

Permalink
Merge pull request #38 from robotichead/development-0.11.1
Browse files Browse the repository at this point in the history
Development 0.11.1
  • Loading branch information
robotichead authored Apr 3, 2018
2 parents 5a6cf27 + a23fa88 commit 3454077
Show file tree
Hide file tree
Showing 21 changed files with 939 additions and 3 deletions.
3 changes: 3 additions & 0 deletions admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
from .models import *

admin.site.register(assigned_users)
admin.site.register(bug)
admin.site.register(bug_client)
admin.site.register(contact_history)
admin.site.register(costs)
admin.site.register(customers)
Expand All @@ -20,6 +22,7 @@
admin.site.register(kanban_column)
admin.site.register(kanban_level)
admin.site.register(list_of_amount_type)
admin.site.register(list_of_bug_client)
admin.site.register(list_of_currency)
admin.site.register(list_of_contact_types)
admin.site.register(list_of_countries_regions)
Expand Down
43 changes: 43 additions & 0 deletions forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,49 @@ class add_permission_set_to_group_form(forms.Form):
)


class bug_client_form(ModelForm):
# Get data for choice boxes
bug_client_results = list_of_bug_client.objects.filter(is_deleted='FALSE')

bug_client_name = forms.CharField(
widget=forms.TextInput(attrs={
'placeholder': 'Bug Client Name',
})
)
list_of_bug_client=forms.ModelChoiceField(
label='Bug Clients',
widget=forms.Select,
queryset=bug_client_results,
empty_label=None,
)
bug_client_url=forms.CharField(
widget=forms.TextInput(attrs={
'placeholder': 'Example: https://bugzilla.nearbeach.org',
})
)
class Meta:
model = bug_client
fields = {
'bug_client_name',
'list_of_bug_client',
'bug_client_url',
}


class bug_search_form(forms.Form):
#Get the choice box
bug_client_results = bug_client.objects.filter(is_deleted="FALSE")

#Fields
list_of_bug_client=forms.ModelChoiceField(
label='Bug Clients',
widget=forms.Select,
queryset=bug_client_results,
empty_label=None,
)
search = forms.CharField(max_length=255)



class customer_campus_form(ModelForm):
customer_phone=forms.CharField(
Expand Down
32 changes: 32 additions & 0 deletions migrations/0004_api_access.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-03-26 10:33
from __future__ import unicode_literals

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import uuid


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('NearBeach', '0003_auto_20180321_1725'),
]

operations = [
migrations.CreateModel(
name='api_access',
fields=[
('api_access_id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('date_created', models.DateTimeField(auto_now_add=True)),
('date_modified', models.DateTimeField(auto_now=True)),
('is_deleted', models.CharField(choices=[('TRUE', 'TRUE'), ('FALSE', 'FALSE')], default='FALSE', max_length=5)),
('change_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='api_access_change_user', to=settings.AUTH_USER_MODEL)),
],
options={
'db_table': 'api_access',
},
),
]
21 changes: 21 additions & 0 deletions migrations/0005_api_access_domain_limiter.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-03-26 10:39
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('NearBeach', '0004_api_access'),
]

operations = [
migrations.AddField(
model_name='api_access',
name='domain_limiter',
field=models.URLField(default='localhost:8000;'),
preserve_default=False,
),
]
100 changes: 100 additions & 0 deletions migrations/0006_auto_20180331_1353.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2018-03-31 02:53
from __future__ import unicode_literals

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('NearBeach', '0005_api_access_domain_limiter'),
]

operations = [
migrations.CreateModel(
name='bug',
fields=[
('bug_id', models.AutoField(primary_key=True, serialize=False)),
('bug_code', models.CharField(max_length=255)),
('bug_description', models.TextField()),
('bug_status', models.CharField(max_length=50)),
('date_created', models.DateTimeField(auto_now_add=True)),
('date_modified', models.DateTimeField(auto_now=True)),
('is_deleted', models.CharField(choices=[('TRUE', 'TRUE'), ('FALSE', 'FALSE')], default='FALSE', max_length=5)),
],
options={
'db_table': 'bug',
},
),
migrations.CreateModel(
name='bug_client',
fields=[
('bug_client_id', models.AutoField(primary_key=True, serialize=False)),
('bug_client_name', models.CharField(max_length=50)),
('bug_client_url', models.URLField()),
('date_created', models.DateTimeField(auto_now_add=True)),
('date_modified', models.DateTimeField(auto_now=True)),
('is_deleted', models.CharField(choices=[('TRUE', 'TRUE'), ('FALSE', 'FALSE')], default='FALSE', max_length=5)),
('change_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bug_client_change_user', to=settings.AUTH_USER_MODEL)),
],
options={
'db_table': 'bug_client',
},
),
migrations.CreateModel(
name='list_of_bug_client',
fields=[
('list_of_bug_client_id', models.AutoField(primary_key=True, serialize=False)),
('bug_client_name', models.CharField(max_length=50)),
('bug_client_api_url', models.CharField(max_length=255)),
('date_created', models.DateTimeField(auto_now_add=True)),
('date_modified', models.DateTimeField(auto_now=True)),
('is_deleted', models.CharField(choices=[('TRUE', 'TRUE'), ('FALSE', 'FALSE')], default='FALSE', max_length=5)),
('change_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='list_of_bug_client_change_user', to=settings.AUTH_USER_MODEL)),
],
options={
'db_table': 'list_of_bug_client',
},
),
migrations.RemoveField(
model_name='api_access',
name='change_user',
),
migrations.DeleteModel(
name='api_access',
),
migrations.AddField(
model_name='bug_client',
name='list_of_bug_client',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='NearBeach.list_of_bug_client'),
),
migrations.AddField(
model_name='bug',
name='bug_client',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='NearBeach.bug_client'),
),
migrations.AddField(
model_name='bug',
name='change_user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bug_change_user', to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name='bug',
name='project',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='NearBeach.project'),
),
migrations.AddField(
model_name='bug',
name='requirements',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='NearBeach.requirements'),
),
migrations.AddField(
model_name='bug',
name='tasks',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='NearBeach.tasks'),
),
]
25 changes: 25 additions & 0 deletions migrations/0007_auto_20180331_1444.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2018-03-31 03:44
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('NearBeach', '0006_auto_20180331_1353'),
]

operations = [
migrations.AddField(
model_name='permission_set',
name='bug',
field=models.IntegerField(choices=[(0, 'No Permission'), (1, 'Read Only'), (2, 'Edit Only'), (3, 'Add and Edit'), (4, 'Full Permission')], default=0),
),
migrations.AddField(
model_name='permission_set',
name='bug_client',
field=models.IntegerField(choices=[(0, 'No Permission'), (1, 'Read Only'), (2, 'Edit Only'), (3, 'Add and Edit'), (4, 'Full Permission')], default=0),
),
]
21 changes: 21 additions & 0 deletions migrations/0008_list_of_bug_client_bug_client_open_bugs.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2018-04-03 02:29
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('NearBeach', '0007_auto_20180331_1444'),
]

operations = [
migrations.AddField(
model_name='list_of_bug_client',
name='bug_client_open_bugs',
field=models.CharField(default="?open_status='True'", max_length=255),
preserve_default=False,
),
]
Loading

0 comments on commit 3454077

Please sign in to comment.