merged default into new-ui

rhodecode/apps/admin/views/exception_tracker.py

@@ -50,7 +50,7 b' class ExceptionsTrackerView(BaseAppView)'
             count +=1
         return count
 
-    def get_all_exceptions(self, read_metadata=False, limit=None):
+    def get_all_exceptions(self, read_metadata=False, limit=None, type_filter=None):
         exc_store_path = exc_tracking.get_exc_store()
         exception_list = []
 
@@ -59,7 +59,7 b' class ExceptionsTrackerView(BaseAppView)'
                 return val.split('_')[-1]
             except Exception:
                 return 0
-        count = 0
+
         for fname in reversed(sorted(os.listdir(exc_store_path), key=key_sorter)):
 
             parts = fname.split('_', 2)
@@ -83,13 +83,17 b' class ExceptionsTrackerView(BaseAppView)'
                 except Exception:
                     log.exception('Failed to read exc data from:{}'.format(full_path))
                     pass
-
             # convert our timestamp to a date obj, for nicer representation
             exc['exc_utc_date'] = time_to_utcdatetime(exc['exc_timestamp'])
+
+            type_present = exc.get('exc_type')
+            if type_filter:
+                if type_present and type_present == type_filter:
+                    exception_list.append(exc)
+            else:
             exception_list.append(exc)
 
-            count += 1
-            if limit and count >= limit:
+            if limit and len(exception_list) >= limit:
                 break
         return exception_list
 
@@ -103,8 +107,10 b' class ExceptionsTrackerView(BaseAppView)'
         c = self.load_default_context()
         c.active = 'exceptions_browse'
         c.limit = safe_int(self.request.GET.get('limit')) or 50
+        c.type_filter = self.request.GET.get('type_filter')
         c.next_limit = c.limit + 50
-        c.exception_list = self.get_all_exceptions(read_metadata=True, limit=c.limit)
+        c.exception_list = self.get_all_exceptions(
+            read_metadata=True, limit=c.limit, type_filter=c.type_filter)
         c.exception_list_count = self.count_all_exceptions()
         c.exception_store_dir = exc_tracking.get_exc_store()
         return self._get_template_context(c)
@@ -132,12 +138,20 b' class ExceptionsTrackerView(BaseAppView)'
     def exception_delete_all(self):
         _ = self.request.translate
         c = self.load_default_context()
+        type_filter = self.request.POST.get('type_filter')
 
         c.active = 'exceptions'
-        all_exc = self.get_all_exceptions()
-        exc_count = len(all_exc)
+        all_exc = self.get_all_exceptions(read_metadata=bool(type_filter), type_filter=type_filter)
+        exc_count = 0
+
         for exc in all_exc:
+            if type_filter:
+                if exc.get('exc_type') == type_filter:
             exc_tracking.delete_exception(exc['exc_id'], prefix=None)
+                    exc_count += 1
+            else:
+                exc_tracking.delete_exception(exc['exc_id'], prefix=None)
+                exc_count += 1
 
         h.flash(_('Removed {} Exceptions').format(exc_count), category='success')
         raise HTTPFound(h.route_path('admin_settings_exception_tracker'))

rhodecode/templates/admin/settings/settings_exceptions_browse.mako

@@ -6,18 +6,24 b''
         % if c.exception_list_count == 1:
             ${_('There is {} stored exception.').format(c.exception_list_count)}
         % else:
-            ${_('There are {} stored exceptions.').format(c.exception_list_count)}
+            ${_('There are total {} stored exceptions.').format(c.exception_list_count)}
         % endif
+        <br/>
         ${_('Store directory')}: ${c.exception_store_dir}
 
       ${h.secure_form(h.route_path('admin_settings_exception_tracker_delete_all'), request=request)}
         <div style="margin: 0 0 20px 0" class="fake-space"></div>
-
+        <input type="hidden" name="type_filter", value="${c.type_filter}">
         <div class="field">
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to delete all exceptions')}');">
                 <i class="icon-remove-sign"></i>
+                % if c.type_filter:
+                    ${_('Delete All `{}`').format(c.type_filter)}
+                % else:
                 ${_('Delete All')}
+                % endif
+
             </button>
         </div>
 
@@ -48,7 +54,9 b''
                 <td><a href="${h.route_path('admin_settings_exception_tracker_show', exception_id=tb['exc_id'])}"><code>${tb['exc_id']}</code></a></td>
                 <td>${h.format_date(tb['exc_utc_date'])}</td>
                 <td>${tb['app_type']}</td>
-                <td>${tb['exc_type']}</td>
+                <td>
+                    <a href="${h.current_route_path(request, type_filter=tb['exc_type'])}">${tb['exc_type']}</a>
+                </td>
             </tr>
             <% cnt -=1 %>
         % endfor