1 files changed, 8 insertions, 2 deletions
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 90eced2f9..a20a151a9 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -163,8 +163,14 @@ update_submit_args = function(){
     var csv_full_url = "{{source_full}}csv?submited=1&" + data;
     $(".{{sname}}-csv-full").attr("href", csv_full_url);
     {% for slug, name, extra_source in extra_sources %}
-    $(".{{slug}}-csv-full").attr("href", '{{extra_source}}csv?submited=1&' + data);
-    {% endfor %}
+    $(".{{slug}}-csv-full").attr("href", '{{extra_source}}csv?submited=1&' + data);{% endfor %}
+    {% for template in current_model.label_templates %}
+    $(".{{template.slug}}-labels").attr("href", '{{template.get_baselink_for_labels}}?submited=1&' + data);{% endfor %}
+
+    if ($('.modal-progress').length > 0){
+        $('.modal-progress').modal('hide');
+    }
+    return false;
 };