pull-requests: added filters to my account pull requests page.

rhodecode/apps/my_account/views/my_account.py

@@ -723,12 +723,12 b' class MyAccountView(BaseAppView, DataGri'
 
         pull_requests = PullRequestModel().get_im_participating_in(
             user_id=self._rhodecode_user.user_id,
-            statuses=statuses,
+            statuses=statuses, query=search_q,
             offset=start, length=limit, order_by=order_by,
             order_dir=order_dir)
 
         pull_requests_total_count = PullRequestModel().count_im_participating_in(
-            user_id=self._rhodecode_user.user_id, statuses=statuses)
+            user_id=self._rhodecode_user.user_id, statuses=statuses, query=search_q)
 
         data = []
         comments_model = CommentsModel()

rhodecode/model/pull_request.py

@@ -355,7 +355,7 b' class PullRequestModel(BaseModel):'
                 PullRequestReviewers.user_id == user_id).all()
         ]
 
-    def _prepare_participating_query(self, user_id=None, statuses=None,
+    def _prepare_participating_query(self, user_id=None, statuses=None, query='',
                                      order_by=None, order_dir='desc'):
         q = PullRequest.query()
         if user_id:
@@ -372,6 +372,13 b' class PullRequestModel(BaseModel):'
         if statuses:
             q = q.filter(PullRequest.status.in_(statuses))
 
+        if query:
+            like_expression = u'%{}%'.format(safe_unicode(query))
+            q = q.filter(or_(
+                cast(PullRequest.pull_request_id, String).ilike(like_expression),
+                PullRequest.title.ilike(like_expression),
+                PullRequest.description.ilike(like_expression),
+            ))
         if order_by:
             order_map = {
                 'name_raw': PullRequest.pull_request_id,
@@ -386,19 +393,19 b' class PullRequestModel(BaseModel):'
 
         return q
 
-    def count_im_participating_in(self, user_id=None, statuses=None):
-        q = self._prepare_participating_query(user_id, statuses=statuses)
+    def count_im_participating_in(self, user_id=None, statuses=None, query=''):
+        q = self._prepare_participating_query(user_id, statuses=statuses, query=query)
         return q.count()
 
     def get_im_participating_in(
-            self, user_id=None, statuses=None, offset=0,
+            self, user_id=None, statuses=None, query='', offset=0,
             length=None, order_by=None, order_dir='desc'):
         """
         Get all Pull requests that i'm participating in, or i have opened
         """
 
         q = self._prepare_participating_query(
-            user_id, statuses=statuses, order_by=order_by,
+            user_id, statuses=statuses, query=query, order_by=order_by,
             order_dir=order_dir)
 
         if length:

rhodecode/templates/admin/my_account/my_account_pullrequests.mako

@@ -2,11 +2,29 b''
 
 <div class="panel panel-default">
   <div class="panel-body">
-      %if c.closed:
-        ${h.checkbox('show_closed',checked="checked", label=_('Show Closed Pull Requests'))}
-      %else:
-        ${h.checkbox('show_closed',label=_('Show Closed Pull Requests'))}
-      %endif
+    <div style="height: 35px">
+        <%
+        selected_filter = 'all'
+        if c.closed:
+            selected_filter = 'all_closed'
+        %>
+
+        <ul class="button-links">
+          <li class="btn ${h.is_active('all', selected_filter)}"><a href="${h.route_path('my_account_pullrequests')}">${_('All')}</a></li>
+          <li class="btn ${h.is_active('all_closed', selected_filter)}"><a href="${h.route_path('my_account_pullrequests', _query={'pr_show_closed':1})}">${_('All + Closed')}</a></li>
+        </ul>
+
+        <div class="grid-quick-filter">
+            <ul class="grid-filter-box">
+                <li class="grid-filter-box-icon">
+                    <i class="icon-search"></i>
+                </li>
+                <li class="grid-filter-box-input">
+                    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+                </li>
+            </ul>
+        </div>
+    </div>
   </div>
 </div>
 
@@ -20,72 +38,107 b''
 </div>
 
 <script type="text/javascript">
-$(document).ready(function() {
+    $(document).ready(function () {
 
-    $('#show_closed').on('click', function(e){
-        if($(this).is(":checked")){
-            window.location = "${h.route_path('my_account_pullrequests', _query={'pr_show_closed':1})}";
-        }
-        else{
-            window.location = "${h.route_path('my_account_pullrequests')}";
-        }
-    });
-
-    var $pullRequestListTable = $('#pull_request_list_table');
+        var $pullRequestListTable = $('#pull_request_list_table');
 
         // participating object list
         $pullRequestListTable.DataTable({
-          processing: true,
-          serverSide: true,
-          ajax: {
-              "url": "${h.route_path('my_account_pullrequests_data')}",
-              "data": function (d) {
-                  d.closed = "${c.closed}";
-              }
-          },
-          dom: 'rtp',
-          pageLength: ${c.visual.dashboard_items},
-          order: [[ 2, "desc" ]],
-          columns: [
-             { data: {"_": "target_repo",
-                      "sort": "target_repo"}, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false},
-             { data: {"_": "status",
-                      "sort": "status"}, title: "", className: "td-status", orderable: false},
-             { data: {"_": "name",
-                      "sort": "name_raw"}, title: "${_('Id')}", className: "td-componentname", "type": "num" },
-             { data: {"_": "title",
-                      "sort": "title"}, title: "${_('Title')}", className: "td-description" },
-             { data: {"_": "author",
-                      "sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false },
-             { data: {"_": "comments",
-                      "sort": "comments_raw"}, title: "", className: "td-comments", orderable: false},
-             { data: {"_": "updated_on",
-                      "sort": "updated_on_raw"}, title: "${_('Last Update')}", className: "td-time" }
-          ],
-          language: {
+            processing: true,
+            serverSide: true,
+            ajax: {
+                "url": "${h.route_path('my_account_pullrequests_data')}",
+                "data": function (d) {
+                    d.closed = "${c.closed}";
+                },
+                "dataSrc": function (json) {
+                    return json.data;
+                }
+            },
+
+            dom: 'rtp',
+            pageLength: ${c.visual.dashboard_items},
+            order: [[2, "desc"]],
+            columns: [
+                {
+                    data: {
+                        "_": "target_repo",
+                        "sort": "target_repo"
+                    }, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false
+                },
+                {
+                    data: {
+                        "_": "status",
+                        "sort": "status"
+                    }, title: "", className: "td-status", orderable: false
+                },
+                {
+                    data: {
+                        "_": "name",
+                        "sort": "name_raw"
+                    }, title: "${_('Id')}", className: "td-componentname", "type": "num"
+                },
+                {
+                    data: {
+                        "_": "title",
+                        "sort": "title"
+                    }, title: "${_('Title')}", className: "td-description"
+                },
+                {
+                    data: {
+                        "_": "author",
+                        "sort": "author_raw"
+                    }, title: "${_('Author')}", className: "td-user", orderable: false
+                },
+                {
+                    data: {
+                        "_": "comments",
+                        "sort": "comments_raw"
+                    }, title: "", className: "td-comments", orderable: false
+                },
+                {
+                    data: {
+                        "_": "updated_on",
+                        "sort": "updated_on_raw"
+                    }, title: "${_('Last Update')}", className: "td-time"
+                }
+            ],
+            language: {
                 paginate: DEFAULT_GRID_PAGINATION,
                 sProcessing: _gettext('loading...'),
                 emptyTable: _gettext("There are currently no open pull requests requiring your participation.")
-          },
-          "drawCallback": function( settings, json ) {
-              timeagoActivate();
-              tooltipActivate();
-          },
-          "createdRow": function ( row, data, index ) {
-              if (data['closed']) {
-                $(row).addClass('closed');
-              }
-              if (data['owned']) {
-                $(row).addClass('owned');
-              }
-          }
+            },
+            "drawCallback": function (settings, json) {
+                timeagoActivate();
+                tooltipActivate();
+            },
+            "createdRow": function (row, data, index) {
+                if (data['closed']) {
+                    $(row).addClass('closed');
+                }
+                if (data['owned']) {
+                    $(row).addClass('owned');
+                }
+            }
         });
-        $pullRequestListTable.on('xhr.dt', function(e, settings, json, xhr){
+        $pullRequestListTable.on('xhr.dt', function (e, settings, json, xhr) {
             $pullRequestListTable.css('opacity', 1);
         });
 
-        $pullRequestListTable.on('preXhr.dt', function(e, settings, data){
+        $pullRequestListTable.on('preXhr.dt', function (e, settings, data) {
             $pullRequestListTable.css('opacity', 0.3);
         });
+
+        // filter
+        $('#q_filter').on('keyup',
+            $.debounce(250, function () {
+                $pullRequestListTable.DataTable().search(
+                        $('#q_filter').val()
+                ).draw();
+            })
+        );
+
     });
+
+
 </script>