v3 change name of starred_repository to star
This commit is contained in:
parent
d3b13e8d7c
commit
baa1881bf7
|
@ -6,7 +6,7 @@ module Travis::API::V3
|
||||||
has_many :builds, dependent: :delete_all, order: 'builds.id DESC'.freeze
|
has_many :builds, dependent: :delete_all, order: 'builds.id DESC'.freeze
|
||||||
has_many :permissions, dependent: :delete_all
|
has_many :permissions, dependent: :delete_all
|
||||||
has_many :users, through: :permissions
|
has_many :users, through: :permissions
|
||||||
has_many :starred_repositories
|
has_many :stars
|
||||||
|
|
||||||
belongs_to :owner, polymorphic: true
|
belongs_to :owner, polymorphic: true
|
||||||
belongs_to :last_build, class_name: 'Travis::API::V3::Models::Build'.freeze
|
belongs_to :last_build, class_name: 'Travis::API::V3::Models::Build'.freeze
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
module Travis::API::V3
|
module Travis::API::V3
|
||||||
class Models::StarredRepository < Model
|
class Models::Star < Model
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
belongs_to :repository
|
belongs_to :repository
|
||||||
end
|
end
|
|
@ -6,7 +6,7 @@ module Travis::API::V3
|
||||||
has_many :tokens, dependent: :destroy
|
has_many :tokens, dependent: :destroy
|
||||||
has_many :organizations, through: :memberships
|
has_many :organizations, through: :memberships
|
||||||
has_many :repositories, as: :owner
|
has_many :repositories, as: :owner
|
||||||
has_many :starred_repositories #TODO
|
has_many :stars #TODO
|
||||||
has_one :subscription, as: :owner
|
has_one :subscription, as: :owner
|
||||||
|
|
||||||
serialize :github_oauth_token, Extensions::EncryptedColumn.new(disable: true)
|
serialize :github_oauth_token, Extensions::EncryptedColumn.new(disable: true)
|
||||||
|
|
|
@ -23,7 +23,7 @@ module Travis::API::V3
|
||||||
|
|
||||||
if user and not starred.nil?
|
if user and not starred.nil?
|
||||||
# user.id works
|
# user.id works
|
||||||
list = list.joins(:starred_repositories).where(starred_repositories: { user_id: user.id })
|
list = list.joins(:stars).where(stars: { user_id: user.id })
|
||||||
end
|
end
|
||||||
|
|
||||||
if includes? 'repository.last_build'.freeze or includes? 'build'.freeze
|
if includes? 'repository.last_build'.freeze or includes? 'build'.freeze
|
||||||
|
|
|
@ -9,13 +9,13 @@ module Travis::API::V3
|
||||||
end
|
end
|
||||||
|
|
||||||
def star(repository, current_user)
|
def star(repository, current_user)
|
||||||
starred = Models::StarredRepository.where(repository_id: repository.id, user_id: current_user.id).first
|
starred = Models::Star.where(repository_id: repository.id, user_id: current_user.id).first
|
||||||
Models::StarredRepository.create(repository_id: repository.id, user_id: current_user.id) unless starred
|
Models::Star.create(repository_id: repository.id, user_id: current_user.id) unless starred
|
||||||
repository
|
repository
|
||||||
end
|
end
|
||||||
|
|
||||||
def unstar(repository, current_user)
|
def unstar(repository, current_user)
|
||||||
starred = Models::StarredRepository.where(repository_id: repository.id, user_id: current_user.id).first
|
starred = Models::Star.where(repository_id: repository.id, user_id: current_user.id).first
|
||||||
starred.delete if starred
|
starred.delete if starred
|
||||||
repository
|
repository
|
||||||
end
|
end
|
||||||
|
|
|
@ -21,7 +21,7 @@ module Travis::API::V3
|
||||||
|
|
||||||
def starred
|
def starred
|
||||||
return false unless access_control.user
|
return false unless access_control.user
|
||||||
Models::StarredRepository.where(repository_id: id, user_id: access_control.user.id).any?
|
Models::Star.where(repository_id: id, user_id: access_control.user.id).any?
|
||||||
end
|
end
|
||||||
|
|
||||||
def include_default_branch?
|
def include_default_branch?
|
||||||
|
|
Loading…
Reference in New Issue
Block a user