Commit 4f185a86 authored by o's avatar o

query deleted and existing at once

parent bcccea4d
Pipeline #4142 failed with stages
in 13 seconds
......@@ -11,9 +11,10 @@ class ResourcesAdminController < ApplicationController
if resource_list.include? @resource_name
begin
@resource_schema = api.resource_schema(@resource_name)['schema']
@resources = api.resource_list(@resource_name)['data']
resources = api.resource_list(@resource_name, 'both')
@resources = resources['data']
@resources.sort! {|a,b| a['uid'] <=> b['uid']}
@deleted_resources = api.resource_list(@resource_name, true)['deleted']
@deleted_resources = resources['deleted']
@deleted_resources.sort! {|a,b| a['uid'] <=> b['uid']}
rescue ApiBackend::ApiError
flash[:danger] = :failed
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment