do not default to yes

digitalmethodsinitiative · Sep 7, 2023 · 1078327 · 1078327
1 parent 98d50a1
commit 1078327
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/backend/lib/processor.py b/backend/lib/processor.py
@@ -332,8 +332,7 @@ def after_process(self):
 				try:
 					send_email([owner], message)
 				except (SMTPException, ConnectionRefusedError, socket.timeout) as e:
-					self.log.error("Sending email to %s" % owner)
-
+					self.log.error("Error sending email to %s" % owner)
 
 	def remove_files(self):
 		"""

diff --git a/webtool/templates/components/processor-details.html b/webtool/templates/components/processor-details.html
@@ -61,10 +61,15 @@ <h4>{{ processor.title }}</h4>
                 {% for option in processor_options %}
                     {% include "components/processor-option.html" %}
                 {% endfor %}
-            {% if __user_config("mail.server") and '@' in current_user.get_name() %}
-                <div class="processor-option">
-                    <label for="email">Email address</label>
-                    <input type="email" name="email" id="email" value="{{ current_user.get_name() }}" placeholder="Email address">
+            {% if __user_config("mail.server") %}
+                <div class="form-element">
+                    <label for="data-email-complete">Receive email on completion:</label>
+                    <div class="filter-parameters">
+                        <label><input type="checkbox" name="email-complete" id="data-email-complete"></label>
+                        <label><input id="data-email-user" type="email" name="email-user" value={{ current_user.get_name() }}></label>
+                        <button class="tooltip-trigger" aria-controls="tooltip-dataset-email" aria-label="Extended help for option">?</button>
+                    </div>
+                    <p role="tooltip" id="tooltip-dataset-email">This will only function if your username is your email address.</p>
                 </div>
             {% endif %}
             </fieldset>

diff --git a/webtool/templates/create-dataset.html b/webtool/templates/create-dataset.html
@@ -64,7 +64,7 @@ <h2><span>Create new dataset</span></h2>
                     <div class="form-element">
                         <label for="data-email-complete">Receive email on completion:</label>
                         <div class="filter-parameters">
-                            <label><input type="checkbox" name="email-complete" id="data-email-complete" checked=""></label>
+                            <label><input type="checkbox" name="email-complete" id="data-email-complete"></label>
                             <label><input id="data-email-user" type="email" name="email-user" value={{ current_user.get_name() }}></label>
                             <button class="tooltip-trigger" aria-controls="tooltip-dataset-email" aria-label="Extended help for option">?</button>
                         </div>