diff --git a/app/controllers/server/websites_controller.rb b/app/controllers/server/websites_controller.rb index 033ac3daa4b5da0a4fbaea8ca29930baee5b94cc..c9e5f860e02af8b2e28fcdae197d8180279ad7e1 100644 --- a/app/controllers/server/websites_controller.rb +++ b/app/controllers/server/websites_controller.rb @@ -13,6 +13,7 @@ class Server::WebsitesController < Server::ApplicationController end def manage_versions + @websites = @websites.with_repository.with_url load_filters breadcrumb add_breadcrumb "Gestion des versions" diff --git a/app/models/communication/website.rb b/app/models/communication/website.rb index 25b5601f4effc8a0a96f2914d23403bf51d40359..6ddbe5fa873f3d02ac901137855b229b5555a900 100644 --- a/app/models/communication/website.rb +++ b/app/models/communication/website.rb @@ -95,10 +95,13 @@ class Communication::Website < ApplicationRecord } scope :for_update, -> (autoupdate) { where(autoupdate_theme: autoupdate) } scope :for_updatable_theme, -> (status) { updatable_theme if status == 'true' } + scope :with_repository, -> { where.not(repository: [nil, '']) } + scope :with_url, -> { where.not(url: [nil, '']) } + scope :with_access_token, -> { where.not(access_token: [nil, '']) } scope :updatable_theme, -> { - where.not(repository: [nil, '']). - where.not(access_token: [nil, '']). - where.not(url: [nil, '']) + with_repository. + with_url. + with_access_token } def to_s