Tweaking error handling

benedwards44 · Nov 27, 2017 · 6b3efe8 · 6b3efe8
1 parent 3e6a063
commit 6b3efe8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/codescanner/scanner.py b/codescanner/scanner.py
@@ -280,7 +280,7 @@ def scan_org(self):
                 if not component.get('success'):
                     errors.append(component.get('fullName') + ': ' + component.get('problem'))
 
-            self.job.error = 'There was an error compiling your code:\n- %s' % ('\n- '.join(errors))
+            self.job.error = 'Code compilation error:\n- %s' % ('\n- '.join(errors))
             self.job.save()
             return
 

diff --git a/sfcodeclean/templates/job.html b/sfcodeclean/templates/job.html
@@ -14,7 +14,7 @@ <h2 class="pull-right">{{ job.username }} <small>{{ job.org_id }}</small></h2>
     {% if job.status == 'Error' %}
         <div class="alert alert-danger" role="alert">
             <em>There was an error running your scan:</em> <br/>
-            {{ job.error}}
+            {{ job.error|linebreaksbr }}
         </div>
     {% else %}
 

diff --git a/sfcodeclean/templates/scanning.html b/sfcodeclean/templates/scanning.html
@@ -21,11 +21,9 @@ <h1 style="font-size:1.5em;margin-top:20px;">Scanning all Apex Code</h1>
 
     <div class="error" style="display:none;">
         <div class="alert alert-danger" role="alert">
-            <p>
-                There was an error processing your request: <i class="error_message"></i>
-                <br/><br/>
-                Please <a href="/">return</a> to the home page and try again.
-            </p>
+            There was an error processing your request:
+            <p id="error_message"></p>
+            <p>Please <a href="/">return</a> to the home page and try again.</p>
         </div>
     </div>
 
@@ -38,15 +36,15 @@ <h1 style="font-size:1.5em;margin-top:20px;">Scanning all Apex Code</h1>
                 dataType: 'json',
                 success: function(resp) 
                 {
-                    if (resp.status == 'Finished')
+                    if (resp.status == 'Finished') 
                     {
                         window.location = "{% url 'job' slug=object.slug %}";
                     } 
                     else if (resp.status == 'Error')
                     {
                         $('.loading-components').hide();
                         $('.error').show();
-                        $('.error_message').text(resp.error);
+                        $('#error_message').html(resp.error.replace(/\n/g, "<br />"));
                         clearInterval(refreshId);
                     }
                     // Else job is still running, this will re-run shortly.
@@ -55,7 +53,7 @@ <h1 style="font-size:1.5em;margin-top:20px;">Scanning all Apex Code</h1>
                 { 
                     $('.loading-components').hide();
                     $('.error').show();
-                    $('.error_message').text(resp);
+                    $('#error_message').html(resp);
                     clearInterval(refreshId);
                 }
             });