no options, fix order

diff --git a/teleforma/admin.py b/teleforma/admin.py
index ae3d55d53e07391ec29fd657b9b88d2ff4c8ce15..67e6bd24f5d2d673736b085aa85962ae393bcfb3 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -12,9 +12,11 @@ admin.site.unregister(User)
 class StudentProfileInline(admin.StackedInline):
     model = Student
     filter_horizontal = ['period']
+    exclude = ['options']
 
 class StudentAdmin(admin.ModelAdmin):
     model = Student
+    exclude = ['options']
 
 class ProfessorProfileInline(admin.StackedInline):
     model = Professor
@@ -33,7 +35,8 @@ class UserProfileAdmin(UserAdmin):
 class TrainingAdmin(admin.ModelAdmin):
     model = Training
     filter_horizontal = ['synthesis_note', 'obligation', 'procedure', 'oral_speciality',
-                         'written_speciality', 'oral_1', 'oral_2', 'options', 'magistral']
+                         'written_speciality', 'oral_1', 'oral_2','magistral']
+    exclude = ['options']
 
 class CourseAdmin(admin.ModelAdmin):
     model = Course

diff --git a/teleforma/models.py b/teleforma/models.py
index 229b0c2e4109fd1fb6c6cf390971daf64c36f1cc..8709ed56f7cf0aef659a1098235ccb9b3c17f793 100755 (executable)
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -457,12 +457,12 @@ class Student(Model):
     procedure       = ForeignKey('Course', related_name="procedure",
                                         verbose_name=_('procedure'),
                                         blank=True, null=True)
-    oral_speciality = ForeignKey('Course', related_name="oral_speciality",
-                                        verbose_name=_('oral speciality'),
-                                        blank=True, null=True)
     written_speciality = ForeignKey('Course', related_name="written_speciality",
                                         verbose_name=_('written speciality'),
                                         blank=True, null=True)
+    oral_speciality = ForeignKey('Course', related_name="oral_speciality",
+                                        verbose_name=_('oral speciality'),
+                                        blank=True, null=True)
     oral_1          = ForeignKey('Course', related_name="oral_1", verbose_name=_('oral 1'),
                                         blank=True, null=True)
     oral_2          = ForeignKey('Course', related_name="oral_2", verbose_name=_('oral 2'),

diff --git a/teleforma/templates/postman/base_write.html b/teleforma/templates/postman/base_write.html
index 45a4da83ddbc91c1f00261a0c5c77b41c7039739..23ad3cee4f9362bf6a041948619f6b193bd67e8c 100644 (file)
--- a/teleforma/templates/postman/base_write.html
+++ b/teleforma/templates/postman/base_write.html
@@ -12,13 +12,13 @@
 {% block content %}
 <div id="postman" class="desk_messages">
 <h1>{% block pm_write_title %}{% endblock %}</h1>
-<!--<div style="padding-top: 0.5em;">
+<div style="padding-top: 0.5em;">
 <select id="_professorSelect" name="professors" onchange="update_recipients();">
 <option>{% trans "Choose a professor" %}</option>
 <option value="admin">me</option>
 <option value="a.abou-el-haja">You</option>
 </select>
-</div>-->
+</div>
 <div class="write_content">
 <form id="_messageForm" action="{% if next_url %}?next={{ next_url|urlencode }}{% endif %}" method="post">{% csrf_token %}
 <table>