Fixes the Edit button showing up as view in teacherreg

derekzhang79 · May 21, 2012 · 29eb583 · 29eb583
1 parent 40d5403
commit 29eb583
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/esp/esp/program/templatetags/class_render_row.py b/esp/esp/program/templatetags/class_render_row.py
@@ -16,10 +16,12 @@ def render_class_manage_row(klass):
 
 
 @cache_inclusion_tag(register, 'inclusion/program/class_teacher_list_row.html')
-def render_class_teacher_list_row(klass):
+def render_class_teacher_list_row(klass, can_edit, friendly_times_with_date):
     return {'cls': klass,
             'program': klass.parent_program,
-            'teacherclsmodule': klass.parent_program.getModuleExtension('ClassRegModuleInfo')}          
+            'teacherclsmodule': klass.parent_program.getModuleExtension('ClassRegModuleInfo'),
+            'can_edit': can_edit,
+            'friendly_times_with_date': friendly_times_with_date}
 render_class_teacher_list_row.cached_function.depend_on_row(ClassSubject, lambda cls: {'klass': cls})
 render_class_teacher_list_row.cached_function.depend_on_row(ClassSection, lambda sec: {'klass': sec.parent_class})
 render_class_teacher_list_row.cached_function.depend_on_cache(ClassSubject.title, lambda self=wildcard, **kwargs: {'klass': self})

diff --git a/esp/templates/inclusion/program/class_copy_row.html b/esp/templates/inclusion/program/class_copy_row.html
@@ -28,16 +28,6 @@
 
 {% block cls_row_3_buttons %}{% endblock %}
 
-{% block cls_row_4_buttons %}
-  {% if cls_manageable %}
-  <td class="clsright">
-    <form method="post" action="/teach/{{program.getUrlBase}}/coteachers">
-      <input type="hidden" name="command" value="edit_class_{{cls.id}}" />
-      <input type="hidden" name="clsid"   value="{{cls.id }}" />
-      <input class="button" type="submit" value="Modify Coteachers">
-    </form>
-  </td>
-  {% endif %}
-{% endblock %}
+{% block cls_row_4_buttons %}{% endblock %}
 
 {% block cls_row_5_buttons %}{% endblock %}
diff --git a/esp/templates/program/modules/teacherclassregmodule/listclasses.html b/esp/templates/program/modules/teacherclassregmodule/listclasses.html
@@ -61,7 +61,7 @@
   {% endif %}
   {% load class_render_row %}
   {% for cls in clslist %}
-    {% render_class_teacher_list_row cls %}
+    {% render_class_teacher_list_row cls can_edit friendly_times_with_date %}
   {% endfor %}
 
    {% if can_create %}