add required initial values to soundfile form

diff --git a/emissions/templates/emissions/episode_detail.html b/emissions/templates/emissions/episode_detail.html
index 24765bff4cccee6a9aa69e1bb0b9fb4b2656ecdb..2cc0d0086c8b346c866fe0ee729195281873911d 100644 (file)
--- a/emissions/templates/emissions/episode_detail.html
+++ b/emissions/templates/emissions/episode_detail.html
@@ -106,14 +106,6 @@ Tags :
 <script>
 $(function() {
   $('.image img').click(function() { $(this).toggleClass('large'); });
-
-  $('#id_fragment').change(function() {
-    if (this.checked) {
-      $('#id_title').parent().show();
-    } else {
-      $('#id_title').parent().hide();
-    }
-  });
 });
 </script>
 {% endblock %}

diff --git a/emissions/templates/emissions/soundfile_form.html b/emissions/templates/emissions/soundfile_form.html
index ef5c9486afd0dbb05c8f453c837d7b7c7bc80d29..d418fd88dd9bcc98fbc7ed1101976fd614ab9a10 100644 (file)
--- a/emissions/templates/emissions/soundfile_form.html
+++ b/emissions/templates/emissions/soundfile_form.html
@@ -12,10 +12,18 @@
       </div>
       {% block buttons %}
       <div class="buttons">
-      <button class="enable-on-change">Enregistrer</button>
+      <button>Enregistrer</button>
       <a class="cancel" href=".">Annuler</a>
       </div>
       {% endblock %}
+      <script>
+  $('#id_fragment').change(function() {
+    if (this.checked) {
+      $('#id_title').parent().show();
+    } else {
+      $('#id_title').parent().hide();
+    }
+  }).trigger('change');
+      </script>
     </form>
 {% endblock %}
-

diff --git a/emissions/views.py b/emissions/views.py
index 69a9dd68e0632cb003aeb80d38bd2465740280d1..9b430e4f5716541b591f67d215da07878cc9eeb6 100644 (file)
--- a/emissions/views.py
+++ b/emissions/views.py
@@ -207,10 +207,6 @@ class EpisodeDetailView(DetailView):
         context = super(EpisodeDetailView, self).get_context_data(**kwargs)
         context['diffusions'] = Diffusion.objects.filter(episode=self.object.id)
         context['soundfiles'] = SoundFile.objects.filter(episode=self.object.id)
-        context['add_soundfile_form'] = SoundFileForm(initial={
-            'episode': self.object,
-            'title': _('Record'),
-            'license': self.object.emission.default_license})
 
         try:
             context['can_manage'] = self.request.user.can_manage(self.object.emission)
@@ -353,6 +349,16 @@ class EpisodeAddSoundFileView(CreateView):
     form_class = SoundFileForm
     model = SoundFile
 
+    def get_initial(self):
+        context = {
+            'episode': Episode.objects.get(
+                slug=self.kwargs.get('slug'),
+                emission__slug=self.kwargs.get('emission_slug')),
+            'title': _('Record'),
+        }
+        context['license'] = context['episode'].emission.default_license
+        return context
+
     def get_form(self, *args, **kwargs):
         emission = Emission.objects.get(slug=self.kwargs.get('emission_slug'))
         if not self.request.user.can_manage(emission):