[webui] Server side processing to incoming requests dataTable

Pair programming with @mdeniz.
openSUSE · Nov 3, 2016 · 54747ab · 54747ab
1 parent e2be787
commit 54747ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/api/app/controllers/webui/user_controller.rb b/src/api/app/controllers/webui/user_controller.rb
@@ -89,7 +89,8 @@ def requests
     request_methods = {
       'all_requests_table'      => :requests,
       'requests_out_table'      => :outgoing_requests,
-      'requests_declined_table' => :declined_requests
+      'requests_declined_table' => :declined_requests,
+      'requests_in_table'       => :incoming_requests
     }
     request_method = request_methods[params[:dataTableId]] || :requests
     @requests = @displayed_user.send(request_method, search)

diff --git a/src/api/app/views/webui/user/show.html.erb b/src/api/app/views/webui/user/show.html.erb
@@ -159,7 +159,7 @@
       </ul>
     </div>
       <div id="requests_in" class="tab">
-        <%= render(:partial => 'shared/requests', :locals => { :requests => @requests_in, :request_table_id => 'requests_in_table', :hide_state => true }) %>
+        <%= render(:partial => 'shared/requests', :locals => { :requests => @requests_in, :request_table_id => 'requests_in_table', :hide_state => true, :serverProcessing => true }) %>
       </div>
       <div id="requests_out" class="tab">
         <%= render(:partial => 'shared/requests', :locals => { :requests => @requests_out, :request_table_id => 'requests_out_table', :hide_state => true, :serverProcessing => true }) %>