Skip to content
Snippets Groups Projects
Commit cb7172c6 authored by Marcela Ribeiro de Oliveira's avatar Marcela Ribeiro de Oliveira
Browse files

merging

parents 1b37d542 f0f612ac
No related branches found
No related tags found
No related merge requests found
......@@ -33,7 +33,7 @@ class V1::Users::BookmarksController < ApplicationController
end
def set_user
@user = User.find(params[:id])
@user = User.find(params[:user_id])
end
def find_object
......
class FollowSerializer < ActiveModel::Serializer
cache key: 'follow', expires_in: 24.hours
attributes :id, :user_id, :followable
def follower
object.user
end
attributes :id, :follower, :followable
end
......@@ -91,8 +91,8 @@ Rails.application.routes.draw do
resources :feed, only: [:index]
resources :users, concerns: [:followable, :deletable, :publisher, :versionable] do
resources :bookmarks, module: 'users', only: [:index, :create, :destroy]
member do
resources :bookmarks, module: 'users', only: [:index, :create, :destroy]
get 'following/:object_type', to: 'users#following'
get 'followers', to: 'users#followers'
get 'activities', to: 'activities#user_activities'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment