Merge branch 'master' into computer_form
This commit is contained in:
commit
e7d76f1da6
|
@ -174,5 +174,4 @@ migrations/
|
||||||
htmlcov/
|
htmlcov/
|
||||||
.second_run
|
.second_run
|
||||||
|
|
||||||
network_inventory/static/
|
/static
|
||||||
!network_inventory/static/core
|
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
"python.linting.enabled": true,
|
"python.linting.enabled": true,
|
||||||
"python.testing.pytestArgs": [
|
"python.testing.pytestArgs": [
|
||||||
".",
|
".",
|
||||||
|
"-n 4",
|
||||||
"--ds=network_inventory.settings.local"
|
"--ds=network_inventory.settings.local"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -15,6 +15,13 @@ local:
|
||||||
pip3 install -r requirements/local.txt; \
|
pip3 install -r requirements/local.txt; \
|
||||||
)
|
)
|
||||||
|
|
||||||
|
testlocal:
|
||||||
|
( \
|
||||||
|
source venv/bin/activate; \
|
||||||
|
pytest -n 6 --ds=network_inventory.settings.local --nomigrations; \
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
sudo find . \( -name __pycache__ -o -name "*.pyc" \) -delete
|
sudo find . \( -name __pycache__ -o -name "*.pyc" \) -delete
|
||||||
sudo rm -f */migrations/0*.py
|
sudo rm -f */migrations/0*.py
|
||||||
|
|
|
@ -5,6 +5,7 @@ if [ -f ./.second_run ]; then
|
||||||
python manage.py makemigrations
|
python manage.py makemigrations
|
||||||
python manage.py migrate
|
python manage.py migrate
|
||||||
else
|
else
|
||||||
|
python manage.py collectstatic --noinput
|
||||||
python manage.py makemigrations backups
|
python manage.py makemigrations backups
|
||||||
python manage.py makemigrations computers
|
python manage.py makemigrations computers
|
||||||
python manage.py makemigrations core
|
python manage.py makemigrations core
|
||||||
|
|
|
@ -130,6 +130,16 @@ A backup can be run on multiple days
|
||||||
|
|
||||||
** TODO Groups [0/1]
|
** TODO Groups [0/1]
|
||||||
*** NEXT Table for groups
|
*** NEXT Table for groups
|
||||||
|
*** NEXT the computer is missing a GPU
|
||||||
|
|
||||||
|
CAD computers often have sppecial graphics cards which we should be able to
|
||||||
|
track.
|
||||||
|
|
||||||
|
** TODO NETs [0/1]
|
||||||
|
*** NEXT the IP needs to be able to be null
|
||||||
|
|
||||||
|
Currently it's always required however when a device is in DHCP mode we can't
|
||||||
|
know the IP for sure.
|
||||||
|
|
||||||
* TODO Nice to Have [0/9]
|
* TODO Nice to Have [0/9]
|
||||||
*** TODO allow technicians to add custom fields
|
*** TODO allow technicians to add custom fields
|
||||||
|
|
|
@ -125,7 +125,7 @@ USE_TZ = True
|
||||||
# Static files (CSS, JavaScript, Images)
|
# Static files (CSS, JavaScript, Images)
|
||||||
# https://docs.djangoproject.com/en/2.0/howto/static-files/
|
# https://docs.djangoproject.com/en/2.0/howto/static-files/
|
||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/static/'
|
||||||
STATIC_ROOT = os.path.join(BASE_DIR, "static")
|
STATIC_ROOT = os.path.join(BASE_DIR, "..", "static")
|
||||||
|
|
||||||
DJANGO_TABLES2_TEMPLATE = "django_tables2/bootstrap4.html"
|
DJANGO_TABLES2_TEMPLATE = "django_tables2/bootstrap4.html"
|
||||||
CRISPY_TEMPLATE_PACK = 'bootstrap4'
|
CRISPY_TEMPLATE_PACK = 'bootstrap4'
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
[pytest]
|
|
||||||
junit_family=legacy
|
|
1
run.sh
1
run.sh
|
@ -5,6 +5,7 @@ if [ -f ./.second_run ]; then
|
||||||
python manage.py makemigrations
|
python manage.py makemigrations
|
||||||
python manage.py migrate
|
python manage.py migrate
|
||||||
else
|
else
|
||||||
|
python manage.py collectstatic --noinput
|
||||||
python manage.py makemigrations backups
|
python manage.py makemigrations backups
|
||||||
python manage.py makemigrations computers
|
python manage.py makemigrations computers
|
||||||
python manage.py makemigrations core
|
python manage.py makemigrations core
|
||||||
|
|
Loading…
Reference in New Issue