diff options
| -rw-r--r-- | lib/toaster/orm/models.py | 4 | ||||
| -rw-r--r-- | lib/toaster/toastergui/templates/builddashboard.html | 45 |
2 files changed, 4 insertions, 45 deletions
diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 6ca45e099..a784b1bf7 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -348,10 +348,6 @@ class Build(models.Model): return Build.BUILD_OUTCOME[int(self.outcome)][1] @property - def toaster_exceptions(self): - return self.logmessage_set.filter(level=LogMessage.EXCEPTION) - - @property def errors(self): return (self.logmessage_set.filter(level=LogMessage.ERROR) | self.logmessage_set.filter(level=LogMessage.EXCEPTION) | diff --git a/lib/toaster/toastergui/templates/builddashboard.html b/lib/toaster/toastergui/templates/builddashboard.html index fc6cae6f2..75ca8bc2c 100644 --- a/lib/toaster/toastergui/templates/builddashboard.html +++ b/lib/toaster/toastergui/templates/builddashboard.html @@ -44,14 +44,6 @@ {%endif%} </div> - {% if build.toaster_exceptions.count > 0 %} - <div class="row"> - <small class="pull-right"> - <i class="icon-question-sign get-help get-help-blue" title="" data-original-title="Toaster exceptions do not affect your build: only the operation of Toaster"></i> - <a class="show-exceptions" href="#exceptions">Toaster threw {{build.toaster_exceptions.count}} exception{{build.toaster_exceptions.count|pluralize}}</a> - </small> - </div> - {% endif %} </div> </div> @@ -69,12 +61,10 @@ <div class="accordion-body collapse in" id="collapse-errors"> <div class="accordion-inner"> <div class="span10"> - {% for error in logmessages %} - {% if error.level == 2 or error.level == 3 %} - <div class="alert alert-error"> - <pre>{{error.message}}</pre> - </div> - {% endif %} + {% for error in build.errors %} + <div class="alert alert-error"> + <pre>{{error.message}}</pre> + </div> {% endfor %} </div> </div> @@ -271,33 +261,6 @@ </div> {% endif %} - -{% if build.toaster_exceptions.count > 0 %} -<div class="accordion span10 pull-right" id="exceptions"> - <div class="accordion-group"> - <div class="accordion-heading"> - <a class="accordion-toggle exception toggle-exceptions"> - <h2 id="exception-toggle"> - <i class="icon-warning-sign"></i> - {{build.toaster_exceptions.count}} Toaster exception{{build.toaster_exceptions.count|pluralize}} - </h2> - </a> - </div> - <div class="accordion-body collapse" id="collapse-exceptions"> - <div class="accordion-inner"> - <div class="span10"> - {% for exception in build.toaster_exceptions %} - <div class="alert alert-exception"> - <pre>{{exception.message}}</pre> - </div> - {% endfor %} - </div> - </div> - </div> - </div> -</div> -{% endif %} - <script type="text/javascript"> $(document).ready(function() { //show warnings section when requested from the previous page |