From 7ba09d31489bef0e136c372ee499aa7e35ecc58f Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Fri, 1 Jul 2016 15:18:38 +0800 Subject: [PATCH] fix some errors with controllers/serializers --- app/controllers/main_controller.rb | 4 ++-- app/serializers/event_serializer.rb | 1 - app/serializers/new_map_serializer.rb | 1 - app/serializers/new_mapping_serializer.rb | 1 - app/serializers/new_synapse_serializer.rb | 1 - app/serializers/new_topic_serializer.rb | 1 - 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 1164d42e..01304328 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -163,8 +163,8 @@ class MainController < ApplicationController @synapses = [] end - # limit to 5 results - @synapses = @synapses.slice(0, 5) + #limit to 5 results + @synapses = @synapses.to_a.slice(0,5) render json: autocomplete_synapse_array_json(@synapses) end diff --git a/app/serializers/event_serializer.rb b/app/serializers/event_serializer.rb index 0e87cd44..723768a7 100644 --- a/app/serializers/event_serializer.rb +++ b/app/serializers/event_serializer.rb @@ -1,5 +1,4 @@ class EventSerializer < ActiveModel::Serializer - embed :ids, include: true attributes :id, :sequence_id, :kind, :map_id, :created_at has_one :actor, serializer: NewUserSerializer, root: 'users' diff --git a/app/serializers/new_map_serializer.rb b/app/serializers/new_map_serializer.rb index c323b09d..d4461243 100644 --- a/app/serializers/new_map_serializer.rb +++ b/app/serializers/new_map_serializer.rb @@ -1,5 +1,4 @@ class NewMapSerializer < ActiveModel::Serializer - embed :ids, include: true attributes :id, :name, :desc, diff --git a/app/serializers/new_mapping_serializer.rb b/app/serializers/new_mapping_serializer.rb index 3ef9a8b6..a0bf1700 100644 --- a/app/serializers/new_mapping_serializer.rb +++ b/app/serializers/new_mapping_serializer.rb @@ -1,5 +1,4 @@ class NewMappingSerializer < ActiveModel::Serializer - embed :ids, include: true attributes :id, :xloc, :yloc, diff --git a/app/serializers/new_synapse_serializer.rb b/app/serializers/new_synapse_serializer.rb index 5cdf644d..3770cf13 100644 --- a/app/serializers/new_synapse_serializer.rb +++ b/app/serializers/new_synapse_serializer.rb @@ -1,5 +1,4 @@ class NewSynapseSerializer < ActiveModel::Serializer - embed :ids, include: true attributes :id, :desc, :category, diff --git a/app/serializers/new_topic_serializer.rb b/app/serializers/new_topic_serializer.rb index 2eb718df..b53470d8 100644 --- a/app/serializers/new_topic_serializer.rb +++ b/app/serializers/new_topic_serializer.rb @@ -1,5 +1,4 @@ class NewTopicSerializer < ActiveModel::Serializer - embed :ids, include: true attributes :id, :name, :desc,