From 982c03c236d26ed787d422a28263e480e637b10a Mon Sep 17 00:00:00 2001
From: Will Plusnick <pwp@utexas.edu>
Date: Sat, 7 Nov 2015 16:33:23 -0600
Subject: [PATCH 01/10] Button type 1.

---
 securedrop/journalist.py                 |  7 ++++---
 securedrop/journalist_templates/col.html | 11 ++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/securedrop/journalist.py b/securedrop/journalist.py
index e78f035793..9afc521717 100644
--- a/securedrop/journalist.py
+++ b/securedrop/journalist.py
@@ -585,16 +585,17 @@ def bulk():
 
     doc_names_selected = request.form.getlist('doc_names_selected')
     selected_docs = [doc for doc in g.source.collection
-                     if doc.filename in doc_names_selected]
-
+                     if (doc.filename in doc_names_selected) or action == 'download_all']
     if selected_docs == []:
         if action == 'download':
             flash("No collections selected to download!", "error")
+        elif action == 'download_all':
+            flash("No collections available to download!", "error")
         elif action == 'delete' or action == 'confirm_delete':
             flash("No collections selected to delete!", "error")
         return redirect(url_for('col', sid=g.sid))
 
-    if action == 'download':
+    if action == 'download' or action == 'download_all':
         return bulk_download(g.sid, selected_docs)
     elif action == 'delete':
         return bulk_delete(g.sid, selected_docs)
diff --git a/securedrop/journalist_templates/col.html b/securedrop/journalist_templates/col.html
index d4338d82c2..86c343cb5f 100644
--- a/securedrop/journalist_templates/col.html
+++ b/securedrop/journalist_templates/col.html
@@ -21,11 +21,12 @@
   {% if source.collection %}
     <p>The documents are stored encrypted for security. To read them, you will need to decrypt them using GPG.</p>
     <form action="/bulk" method="post">
-      <div class="document-actions">
-        <div id='select-container'></div>
-        <button type="submit" name="action" value="download"><i class="fa fa-download"></i> Download selected</button>
-        <button type="submit" name="action" value="confirm_delete" class="danger" id="delete_selected"><i class="fa fa-times"></i> Delete selected</button>
-      </div>
+    <div class="document-actions">
+      <div id='select-container'></div>
+      <button type="submit" name="action" value="download_all"><i class="fa fa-download"></i> Download all</button>
+      <button type="submit" name="action" value="download"><i class="fa fa-download"></i> Download selected</button>
+      <button type="submit" name="action" value="confirm_delete" class="danger" id="delete_selected"><i class="fa fa-times"></i> Delete selected</button>
+    </div>
       <ul id="submissions" class="plain submissions">
         {% for doc in source.collection %}
           <li class="submission"><input type="checkbox" name="doc_names_selected" value="{{ doc.filename }}" class="doc-check"/>

From ca1e5bc41d73e4ebcdd90388d1d107bc6405ecad Mon Sep 17 00:00:00 2001
From: Will Plusnick <pwp@utexas.edu>
Date: Sat, 7 Nov 2015 18:04:23 -0600
Subject: [PATCH 02/10] Address comments for Button 1.

---
 securedrop/journalist.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/securedrop/journalist.py b/securedrop/journalist.py
index 9afc521717..4ad40d30dc 100644
--- a/securedrop/journalist.py
+++ b/securedrop/journalist.py
@@ -584,8 +584,11 @@ def bulk():
     action = request.form['action']
 
     doc_names_selected = request.form.getlist('doc_names_selected')
-    selected_docs = [doc for doc in g.source.collection
-                     if (doc.filename in doc_names_selected) or action == 'download_all']
+    if action == 'download_all':
+        selected_docs = g.source.collection
+    else:
+        selected_docs = [doc for doc in g.source.collection
+                         if doc.filename in doc_names_selected]
     if selected_docs == []:
         if action == 'download':
             flash("No collections selected to download!", "error")

From 3fb85977a1f4657f6895879b579d9d5eba0b081f Mon Sep 17 00:00:00 2001
From: Will Plusnick <pwp@utexas.edu>
Date: Sat, 7 Nov 2015 21:21:52 -0600
Subject: [PATCH 03/10] Button 2. Might be buggy.

---
 securedrop/journalist.py                   | 24 ++++++++++++++++------
 securedrop/journalist_templates/index.html |  1 +
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/securedrop/journalist.py b/securedrop/journalist.py
index 4ad40d30dc..78223cb3ae 100644
--- a/securedrop/journalist.py
+++ b/securedrop/journalist.py
@@ -578,6 +578,16 @@ def download_unread(sid):
     return bulk_download(sid, docs)
 
 
+@app.route('/download_all_unread')
+@login_required
+def download_all_unread():
+    docs = Submission.query.filter(Submission.downloaded == False).all()
+    if docs == []:
+        flash("No unread documents in collections!", "error")
+        return redirect(url_for('index'))
+    return bulk_dl('all_unread_' + g.user.username, docs)
+
+
 @app.route('/bulk', methods=('POST',))
 @login_required
 def bulk():
@@ -631,7 +641,11 @@ def bulk_delete(sid, items_selected):
 
 def bulk_download(sid, items_selected):
     source = get_source(sid)
-    filenames = [store.path(sid, item.filename) for item in items_selected]
+    return bulk_dl(source.journalist_filename, items_selected)
+
+def bulk_dl(zip_directory, items_selected):
+    filenames = [store.path(item.source.filesystem_id, item.filename)
+                 for item in items_selected]
 
     # Mark the submissions that are about to be downloaded as such
     for item in items_selected:
@@ -639,12 +653,10 @@ def bulk_download(sid, items_selected):
             item.downloaded = True
     db_session.commit()
 
-    zf = store.get_bulk_archive(
-        filenames,
-        zip_directory=source.journalist_filename)
+    zf = store.get_bulk_archive(filenames,
+                                zip_directory=zip_directory)
     attachment_filename = "{}--{}.zip".format(
-        source.journalist_filename,
-        datetime.utcnow().strftime("%Y-%m-%d--%H-%M-%S"))
+        zip_directory, datetime.utcnow().strftime("%Y-%m-%d--%H-%M-%S"))
     return send_file(zf.name, mimetype="application/zip",
                      attachment_filename=attachment_filename,
                      as_attachment=True)
diff --git a/securedrop/journalist_templates/index.html b/securedrop/journalist_templates/index.html
index 0730a66ba4..6338cb8d00 100644
--- a/securedrop/journalist_templates/index.html
+++ b/securedrop/journalist_templates/index.html
@@ -8,6 +8,7 @@ <h2><span class="headline">Sources</span></h2>
       <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
       <p>
         <span id="select_all" class="select"><i class="fa fa-check-square-o"></i> select all</span> <span id="select_none" class="select"><i class="fa fa-square-o"></i> select none</span>
+        <a href="{{ url_for('download_all_unread') }}" class="btn small">Download all unread</a>
         <button type="submit" id="delete_collections" name="action" value="delete" class="small"><i class="fa fa-minus-circle"></i> Delete selected</button>
         <button type="submit" name="action" value="star" class="small"><i class="fa fa-minus-circle"></i> Star Selected</button>
         <button type="submit" name="action" value="un-star" class="small"><i class="fa fa-minus-circle"></i> Un-star Selected</button>

From 405d1d883b21c4931667e8c52f0fd5b56623a036 Mon Sep 17 00:00:00 2001
From: Will Plusnick <pwp@utexas.edu>
Date: Sat, 12 Dec 2015 15:52:39 -0600
Subject: [PATCH 04/10] Extend and improve bulk download unit test

This improves the bulk download unit test by having it check that only
selected files are downloaded and not unselected files. It extends the
unit test to include a test for downloading all present files.
---
 securedrop/tests/test_unit_journalist.py | 48 +++++++++++++++++++++---
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/securedrop/tests/test_unit_journalist.py b/securedrop/tests/test_unit_journalist.py
index 807fc449e9..301c3f107c 100644
--- a/securedrop/tests/test_unit_journalist.py
+++ b/securedrop/tests/test_unit_journalist.py
@@ -415,28 +415,66 @@ def test_edit_hotp(self):
         # should redirect to verification page
         self.assertRedirects(res, url_for('account_new_two_factor'))
 
-    def test_bulk_download(self):
+    def test_selected_bulk_download(self):
         sid = 'EQZGCJBRGISGOTC2NZVWG6LILJBHEV3CINNEWSCLLFTUWZJPKJFECLS2NZ4G4U3QOZCFKTTPNZMVIWDCJBBHMUDBGFHXCQ3R'
         source = Source(sid, crypto_util.display_id())
         db_session.add(source)
         db_session.commit()
-        files = ['1-abc1-msg.gpg', '2-abc2-msg.gpg']
+        files = ['1-abc1-msg.gpg', '2-abc2-msg.gpg', '3-abc3-msg.gpg', '4-abc4-msg.gpg']
+        selected_files = files[:2]
+        unselected_files = files[2:]
         filenames = common.setup_test_docs(sid, files)
 
         self._login_user()
         rv = self.client.post('/bulk', data=dict(
             action='download',
             sid=sid,
-            doc_names_selected=files
+            doc_names_selected=selected_files
         ))
 
         self.assertEqual(rv.status_code, 200)
         self.assertEqual(rv.content_type, 'application/zip')
         self.assertTrue(zipfile.is_zipfile(StringIO(rv.data)))
-        self.assertTrue(zipfile.ZipFile(StringIO(rv.data)).getinfo(
-            os.path.join(source.journalist_filename, files[0])
+
+        for file in selected_files:
+            self.assertTrue(zipfile.ZipFile(StringIO(rv.data)).getinfo(
+                 os.path.join(source.journalist_filename, file)
+            ))
+
+        for file in unselected_files:
+            try:
+                zipfile.ZipFile(StringIO(rv.data)).getinfo(
+                    os.path.join(source.journalist_filename, file))
+            except KeyError:
+                pass
+            else:
+                self.assertTrue(False)
+            
+
+
+    def test_download_all_bulk_download(self):
+        sid = 'EQZGCJBRGISGOTC2NZVWG6LILJBHEV3CINNEWSCLLFTUWZJPKJFECLS2NZ4G4U3QOZCFKTTPNZMVIWDCJBBHMUDBGFHXCQ3R'
+        source = Source(sid, crypto_util.display_id())
+        db_session.add(source)
+        db_session.commit()
+        files = ['1-abc1-msg.gpg', '2-abc2-msg.gpg', '3-abc3-msg.gpg', '4-abc4-msg.gpg']
+        filenames = common.setup_test_docs(sid, files)
+
+        self._login_user()
+        rv = self.client.post('/bulk', data=dict(
+             action='download_all',
+             sid=sid
         ))
 
+        self.assertEqual(rv.status_code, 200)
+        self.assertEqual(rv.content_type, 'application/zip')
+        self.assertTrue(zipfile.is_zipfile(StringIO(rv.data)))
+        for file in files:
+            self.assertTrue(zipfile.ZipFile(StringIO(rv.data)).getinfo(
+                 os.path.join(source.journalist_filename, file)
+            ))
+
+
     def test_max_password_length(self):
         """Creating a Journalist with a password that is greater than the
         maximum password length should raise an exception"""

From 4619c6943d1504b3bec407ed33dd9038c3565f22 Mon Sep 17 00:00:00 2001
From: Will Plusnick <pwp@utexas.edu>
Date: Sat, 12 Dec 2015 21:35:42 -0600
Subject: [PATCH 05/10] Add unit test for download_all_unread

---
 securedrop/tests/test_unit_journalist.py | 28 +++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/securedrop/tests/test_unit_journalist.py b/securedrop/tests/test_unit_journalist.py
index 301c3f107c..7b7188ced9 100644
--- a/securedrop/tests/test_unit_journalist.py
+++ b/securedrop/tests/test_unit_journalist.py
@@ -449,7 +449,7 @@ def test_selected_bulk_download(self):
                 pass
             else:
                 self.assertTrue(False)
-            
+
 
 
     def test_download_all_bulk_download(self):
@@ -475,6 +475,32 @@ def test_download_all_bulk_download(self):
             ))
 
 
+    def test_download_all(self):
+        sid = 'EQZGCJBRGISGOTC2NZVWG6LILJBHEV3CINNEWSCLLFTUWZJPKJFECLS2NZ4G4U3QOZCFKTTPNZMVIWDCJBBHMUDBGFHXCQ3R'
+        source = Source(sid, crypto_util.display_id())
+        db_session.add(source)
+        db_session.commit()
+        files = ['1-abc1-msg.gpg', '2-abc2-msg.gpg', '3-abc3-msg.gpg', '4-abc4-msg.gpg']
+        selected_files = files[::2]
+        unselected_files = files[1::2]
+        filenames = common.setup_test_docs(sid, files)
+
+        self._login_user()
+        rv = self.client.post('/bulk', data=dict(
+                action='download',
+                sid=sid,
+                doc_names_selected=selected_files
+        ))
+        rv = self.client.get('/download_all_unread')
+        self.assertEqual(rv.status_code, 200)
+        self.assertEqual(rv.content_type, 'application/zip')
+        self.assertTrue(len(zipfile.ZipFile(StringIO(rv.data)).namelist()) == \
+                        len(unselected_files))
+        for file in unselected_files:
+            self.assertTrue(zipfile.ZipFile(StringIO(rv.data)).getinfo(
+                os.path.join('all_unread_'+g.user.username, file
+            )))
+
     def test_max_password_length(self):
         """Creating a Journalist with a password that is greater than the
         maximum password length should raise an exception"""

From 50564104fafbd4e9ad2fd180e800e3f1f1aa7034 Mon Sep 17 00:00:00 2001
From: AJ Bahnken <aj.bahnken@procore.com>
Date: Sat, 5 Nov 2016 16:13:35 -0700
Subject: [PATCH 06/10] Clean up action checking and get tests passing

---
 securedrop/journalist.py                 | 2 +-
 securedrop/tests/test_unit_journalist.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/securedrop/journalist.py b/securedrop/journalist.py
index 78223cb3ae..22817dc7d2 100644
--- a/securedrop/journalist.py
+++ b/securedrop/journalist.py
@@ -608,7 +608,7 @@ def bulk():
             flash("No collections selected to delete!", "error")
         return redirect(url_for('col', sid=g.sid))
 
-    if action == 'download' or action == 'download_all':
+    if action in ('download', 'download_all'):
         return bulk_download(g.sid, selected_docs)
     elif action == 'delete':
         return bulk_delete(g.sid, selected_docs)
diff --git a/securedrop/tests/test_unit_journalist.py b/securedrop/tests/test_unit_journalist.py
index 7b7188ced9..4ea1c3e9cb 100644
--- a/securedrop/tests/test_unit_journalist.py
+++ b/securedrop/tests/test_unit_journalist.py
@@ -7,7 +7,7 @@
 import mock
 
 from flask_testing import TestCase
-from flask import url_for, escape
+from flask import url_for, escape, g
 
 import crypto_util
 import journalist

From e0d7242ed39872b184a7eae1c1ca9ad2931077bd Mon Sep 17 00:00:00 2001
From: AJ Bahnken <aj.bahnken@procore.com>
Date: Sat, 5 Nov 2016 16:52:19 -0700
Subject: [PATCH 07/10] Extend test coverage to all new code in download all PR

---
 securedrop/tests/test_unit_journalist.py | 62 +++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/securedrop/tests/test_unit_journalist.py b/securedrop/tests/test_unit_journalist.py
index 4ea1c3e9cb..633687d966 100644
--- a/securedrop/tests/test_unit_journalist.py
+++ b/securedrop/tests/test_unit_journalist.py
@@ -474,6 +474,50 @@ def test_download_all_bulk_download(self):
                  os.path.join(source.journalist_filename, file)
             ))
 
+    def test_download_bulk_download_nothing_selected(self):
+        sid = 'EQZGCJBRGISGOTC2NZVWG6LILJBHEV3CINNEWSCLLFTUWZJPKJFECLS2NZ4G4U3QOZCFKTTPNZMVIWDCJBBHMUDBGFHXCQ3R'
+        source = Source(sid, crypto_util.display_id())
+        db_session.add(source)
+        db_session.commit()
+        files = ['1-abc1-msg.gpg', '2-abc2-msg.gpg', '3-abc3-msg.gpg', '4-abc4-msg.gpg']
+        common.setup_test_docs(sid, files)
+
+        self._login_user()
+        rv = self.client.post('/bulk', data=dict(
+                action='download',
+                sid=sid,
+                doc_names_selected = []
+        ))
+        self.assertRedirects(rv, url_for('col', sid=sid))
+
+    def test_download_bulk_download_all_no_submissions(self):
+        sid = 'EQZGCJBRGISGOTC2NZVWG6LILJBHEV3CINNEWSCLLFTUWZJPKJFECLS2NZ4G4U3QOZCFKTTPNZMVIWDCJBBHMUDBGFHXCQ3R'
+        source = Source(sid, crypto_util.display_id())
+        db_session.add(source)
+        db_session.commit()
+
+        self._login_user()
+        rv = self.client.post('/bulk', data=dict(
+                action='download_all',
+                sid=sid,
+        ))
+        self.assertRedirects(rv, url_for('col', sid=sid))
+
+    def test_delete_bulk_delete_nothing_selected(self):
+        sid = 'EQZGCJBRGISGOTC2NZVWG6LILJBHEV3CINNEWSCLLFTUWZJPKJFECLS2NZ4G4U3QOZCFKTTPNZMVIWDCJBBHMUDBGFHXCQ3R'
+        source = Source(sid, crypto_util.display_id())
+        db_session.add(source)
+        db_session.commit()
+        files = ['1-abc1-msg.gpg', '2-abc2-msg.gpg', '3-abc3-msg.gpg', '4-abc4-msg.gpg']
+        common.setup_test_docs(sid, files)
+
+        self._login_user()
+        rv = self.client.post('/bulk', data=dict(
+                action='delete',
+                sid=sid,
+                doc_names_selected = []
+        ))
+        self.assertRedirects(rv, url_for('col', sid=sid))
 
     def test_download_all(self):
         sid = 'EQZGCJBRGISGOTC2NZVWG6LILJBHEV3CINNEWSCLLFTUWZJPKJFECLS2NZ4G4U3QOZCFKTTPNZMVIWDCJBBHMUDBGFHXCQ3R'
@@ -483,7 +527,7 @@ def test_download_all(self):
         files = ['1-abc1-msg.gpg', '2-abc2-msg.gpg', '3-abc3-msg.gpg', '4-abc4-msg.gpg']
         selected_files = files[::2]
         unselected_files = files[1::2]
-        filenames = common.setup_test_docs(sid, files)
+        common.setup_test_docs(sid, files)
 
         self._login_user()
         rv = self.client.post('/bulk', data=dict(
@@ -501,6 +545,22 @@ def test_download_all(self):
                 os.path.join('all_unread_'+g.user.username, file
             )))
 
+    def test_download_all_with_no_unread_submissions(self):
+        sid = 'EQZGCJBRGISGOTC2NZVWG6LILJBHEV3CINNEWSCLLFTUWZJPKJFECLS2NZ4G4U3QOZCFKTTPNZMVIWDCJBBHMUDBGFHXCQ3R'
+        source = Source(sid, crypto_util.display_id())
+        db_session.add(source)
+        db_session.commit()
+        files = ['1-abc1-msg.gpg', '2-abc2-msg.gpg', '3-abc3-msg.gpg', '4-abc4-msg.gpg']
+        common.setup_test_docs(sid, files)
+
+        self._login_user()
+        rv = self.client.post('/bulk', data=dict(
+                action='download_all',
+                sid=sid,
+        ))
+        rv = self.client.get('/download_all_unread')
+        self.assertRedirects(rv, url_for('index'))
+
     def test_max_password_length(self):
         """Creating a Journalist with a password that is greater than the
         maximum password length should raise an exception"""

From 1337fbb4881c606a2d62fc50f61bb76cc54aaa81 Mon Sep 17 00:00:00 2001
From: AJ Bahnken <aj.bahnken@procore.com>
Date: Sat, 5 Nov 2016 16:58:42 -0700
Subject: [PATCH 08/10] Style cleanup in test_unit_journalist.py

---
 securedrop/tests/test_unit_journalist.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/securedrop/tests/test_unit_journalist.py b/securedrop/tests/test_unit_journalist.py
index 633687d966..09f6e965fc 100644
--- a/securedrop/tests/test_unit_journalist.py
+++ b/securedrop/tests/test_unit_journalist.py
@@ -423,7 +423,7 @@ def test_selected_bulk_download(self):
         files = ['1-abc1-msg.gpg', '2-abc2-msg.gpg', '3-abc3-msg.gpg', '4-abc4-msg.gpg']
         selected_files = files[:2]
         unselected_files = files[2:]
-        filenames = common.setup_test_docs(sid, files)
+        common.setup_test_docs(sid, files)
 
         self._login_user()
         rv = self.client.post('/bulk', data=dict(
@@ -450,15 +450,13 @@ def test_selected_bulk_download(self):
             else:
                 self.assertTrue(False)
 
-
-
     def test_download_all_bulk_download(self):
         sid = 'EQZGCJBRGISGOTC2NZVWG6LILJBHEV3CINNEWSCLLFTUWZJPKJFECLS2NZ4G4U3QOZCFKTTPNZMVIWDCJBBHMUDBGFHXCQ3R'
         source = Source(sid, crypto_util.display_id())
         db_session.add(source)
         db_session.commit()
         files = ['1-abc1-msg.gpg', '2-abc2-msg.gpg', '3-abc3-msg.gpg', '4-abc4-msg.gpg']
-        filenames = common.setup_test_docs(sid, files)
+        common.setup_test_docs(sid, files)
 
         self._login_user()
         rv = self.client.post('/bulk', data=dict(

From 5c1e5c5a61c2ced5a9e519d180dc5d4860505e55 Mon Sep 17 00:00:00 2001
From: AJ Bahnken <aj.bahnken@procore.com>
Date: Sat, 5 Nov 2016 21:13:29 -0700
Subject: [PATCH 09/10] Fixes based on code review

---
 securedrop/journalist.py                 |  3 ++-
 securedrop/journalist_templates/col.html | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/securedrop/journalist.py b/securedrop/journalist.py
index 22817dc7d2..826e428289 100644
--- a/securedrop/journalist.py
+++ b/securedrop/journalist.py
@@ -585,7 +585,7 @@ def download_all_unread():
     if docs == []:
         flash("No unread documents in collections!", "error")
         return redirect(url_for('index'))
-    return bulk_dl('all_unread_' + g.user.username, docs)
+    return bulk_dl('all_unread', docs)
 
 
 @app.route('/bulk', methods=('POST',))
@@ -643,6 +643,7 @@ def bulk_download(sid, items_selected):
     source = get_source(sid)
     return bulk_dl(source.journalist_filename, items_selected)
 
+
 def bulk_dl(zip_directory, items_selected):
     filenames = [store.path(item.source.filesystem_id, item.filename)
                  for item in items_selected]
diff --git a/securedrop/journalist_templates/col.html b/securedrop/journalist_templates/col.html
index 86c343cb5f..4f9a5b5b41 100644
--- a/securedrop/journalist_templates/col.html
+++ b/securedrop/journalist_templates/col.html
@@ -21,12 +21,12 @@
   {% if source.collection %}
     <p>The documents are stored encrypted for security. To read them, you will need to decrypt them using GPG.</p>
     <form action="/bulk" method="post">
-    <div class="document-actions">
-      <div id='select-container'></div>
-      <button type="submit" name="action" value="download_all"><i class="fa fa-download"></i> Download all</button>
-      <button type="submit" name="action" value="download"><i class="fa fa-download"></i> Download selected</button>
-      <button type="submit" name="action" value="confirm_delete" class="danger" id="delete_selected"><i class="fa fa-times"></i> Delete selected</button>
-    </div>
+      <div class="document-actions">
+        <div id='select-container'></div>
+        <button type="submit" name="action" value="download_all"><i class="fa fa-download"></i> Download all</button>
+        <button type="submit" name="action" value="download"><i class="fa fa-download"></i> Download selected</button>
+        <button type="submit" name="action" value="confirm_delete" class="danger" id="delete_selected"><i class="fa fa-times"></i> Delete selected</button>
+      </div>
       <ul id="submissions" class="plain submissions">
         {% for doc in source.collection %}
           <li class="submission"><input type="checkbox" name="doc_names_selected" value="{{ doc.filename }}" class="doc-check"/>

From d56277dbd3aba626e200243dd570aea8da38fa06 Mon Sep 17 00:00:00 2001
From: AJ Bahnken <aj.bahnken@procore.com>
Date: Sat, 5 Nov 2016 21:23:18 -0700
Subject: [PATCH 10/10] Fix test for removal of g.user.username from all_unread

---
 securedrop/tests/test_unit_journalist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/securedrop/tests/test_unit_journalist.py b/securedrop/tests/test_unit_journalist.py
index 09f6e965fc..21cfd7de2f 100644
--- a/securedrop/tests/test_unit_journalist.py
+++ b/securedrop/tests/test_unit_journalist.py
@@ -540,7 +540,7 @@ def test_download_all(self):
                         len(unselected_files))
         for file in unselected_files:
             self.assertTrue(zipfile.ZipFile(StringIO(rv.data)).getinfo(
-                os.path.join('all_unread_'+g.user.username, file
+                os.path.join('all_unread', file
             )))
 
     def test_download_all_with_no_unread_submissions(self):