Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplified json rendering.

Browse source
This commit is contained in:
Martin Edenhofer 2012-04-14 18:47:37 +02:00
parent 6047e63666
commit 7b3d341568
1 changed files with 62 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

162
app/controllers/ticket_overviews_controller.rb
View file

@ -67,9 +67,7 @@ class TicketOverviewsController < ApplicationController
result.push all.merge( { :count => count } ) result.push all.merge( { :count => count } )
} }
respond_to do |format| render :json => result
format.json { render :json => result }
end
return return
end end
@ -110,21 +108,17 @@ class TicketOverviewsController < ApplicationController
} }
# return result # return result
respond_to do |format| render :json => {
format.json { :overview => overview_selected,
render :json => { :tickets => tickets,
:overview => overview_selected, :tickets_count => tickets_count,
:tickets => tickets, :users => users,
:tickets_count => tickets_count, :bulk => {
:users => users, :owner_id => {
:bulk => { :id => bulk_owner_ids,
:owner_id => {
:id => bulk_owner_ids,
}
},
} }
} },
end }
end end
@ -157,29 +151,25 @@ class TicketOverviewsController < ApplicationController
} }
# return result # return result
respond_to do |format| render :json => {
format.json {
render :json => {
# :ticket => ticket, # :ticket => ticket,
# :articles => articles, # :articles => articles,
:users => users, :users => users,
:edit_form => { :edit_form => {
:owner_id => { :owner_id => {
:id => ticket_owner_ids :id => ticket_owner_ids
}, },
:group_id => { :group_id => {
:id => ticket_group_ids :id => ticket_group_ids
}, },
:ticket_state_id => { :ticket_state_id => {
:id => ticket_state_ids :id => ticket_state_ids
}, },
:ticket_priority_id => { :ticket_priority_id => {
:id => ticket_priority_ids :id => ticket_priority_ids
}
}
} }
} }
end }
end end
# GET /ticket_full/1 # GET /ticket_full/1
@ -230,20 +220,16 @@ class TicketOverviewsController < ApplicationController
log_view(ticket) log_view(ticket)
# return result # return result
respond_to do |format| render :json => {
format.json { :ticket => ticket,
render :json => { :articles => articles,
:ticket => ticket, :users => users,
:articles => articles, :edit_form => {
:users => users, :owner_id => {
:edit_form => { :id => owner_ids
:owner_id => {
:id => owner_ids
}
}
} }
} }
end }
end end
# POST /ticket_attachment/new # POST /ticket_attachment/new
@ -268,13 +254,9 @@ class TicketOverviewsController < ApplicationController
) )
# return result # return result
respond_to do |format| render :json => {
format.json { :success => true,
render :json => { }
:success => true,
}
}
end
end end
# GET /ticket_attachment/1 # GET /ticket_attachment/1
@ -340,17 +322,13 @@ class TicketOverviewsController < ApplicationController
# end # end
# return result # return result
respond_to do |format| render :json => {
format.json { :tickets => {
render :json => { :open => tickets_open,
:tickets => { :closed => tickets_closed
:open => tickets_open,
:closed => tickets_closed
}
# :users => users,
}
} }
end # :users => users,
}
end end
# GET /ticket_history/1 # GET /ticket_history/1
@ -377,18 +355,14 @@ class TicketOverviewsController < ApplicationController
history_attributes = History::Attribute.all() history_attributes = History::Attribute.all()
# return result # return result
respond_to do |format| render :json => {
format.json { :ticket => ticket,
render :json => { :users => users,
:ticket => ticket, :history => history,
:users => users, :history_objects => history_objects,
:history => history, :history_types => history_types,
:history_objects => history_objects, :history_attributes => history_attributes
:history_types => history_types, }
:history_attributes => history_attributes
}
}
end
end end
# GET /activity_stream # GET /activity_stream
@ -419,15 +393,11 @@ class TicketOverviewsController < ApplicationController
} }
# return result # return result
respond_to do |format| render :json => {
format.json { :activity_stream => activity_stream,
render :json => { :tickets => tickets,
:activity_stream => activity_stream, :users => users,
:tickets => tickets, }
:users => users,
}
}
end
end end
# GET /recent_viewed # GET /recent_viewed
@ -458,15 +428,11 @@ class TicketOverviewsController < ApplicationController
} }
# return result # return result
respond_to do |format| render :json => {
format.json { :recent_viewed => recent_viewed,
render :json => { :tickets => tickets,
:recent_viewed => recent_viewed, :users => users,
:tickets => tickets, }
:users => users,
}
}
end
end end
# GET /user_search # GET /user_search
@ -497,10 +463,6 @@ class TicketOverviewsController < ApplicationController
end end
# return result # return result
respond_to do |format| render :json => users
format.json {
render :json => users
}
end
end end
end end