Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git

haribo
2 parents 6d86da1b b19bc2d1
Showing 3 changed files with 9 additions and 4 deletions Show diff stats
src/pyrosapp/.gitignore
src/pyrosapp/admin.py
src/pyrosapp/migrations/0001_initial.py
@@ -0,0 +1 @@
+/migrations/
@@ -2,6 +2,9 @@ from django import forms
 from django.contrib import admin
 from django.contrib.auth.models import User
  
+# EP
+from django.conf import settings
+
 #TODO?:
 #from pyrosapp import models as pyrosapp_models
 from pyrosapp.models import *
@@ -36,11 +39,11 @@ class ReadOnlyModelAdmin(admin.ModelAdmin):
 # EP added
  
 # Edit mode
-DEBUG = False
+#DEBUG = False
 # View only mode
 #DEBUG = True
  
-if DEBUG:
+if settings.DEBUG:
     class PyrosModelAdmin(ReadOnlyModelAdmin):
         pass
 else:
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-03-24 15:00
+# Generated by Django 1.9.4 on 2016-03-24 17:01
 from __future__ import unicode_literals
  
 from django.conf import settings
@@ -197,6 +197,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('desc', models.TextField(blank=True, null=True)),
+                ('desce', models.TextField(blank=True, null=True)),
                 ('created', models.DateTimeField(blank=True, null=True)),
                 ('updated', models.DateTimeField(blank=True, null=True)),
                 ('url', models.CharField(blank=True, max_length=45, null=True)),
@@ -467,7 +468,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='schedulehistory',
             name='sequences',
-            field=models.ManyToManyField(related_name='schedulehistorys', to='pyrosapp.Sequence'),
+            field=models.ManyToManyField(related_name='schedulehistories', to='pyrosapp.Sequence'),
         ),
         migrations.AddField(
             model_name='request',