Skip to content

Commit cefbb90

Browse files
committed
Improve the way the beta is checked
1 parent b8a66d6 commit cefbb90

File tree

11 files changed

+280
-275
lines changed

11 files changed

+280
-275
lines changed

src/api/app/controllers/webui/package_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class Webui::PackageController < Webui::WebuiController
1616
save_person save_group remove_role view_file
1717
buildresult rpmlint_result rpmlint_log rpmlint_summary files]
1818

19-
before_action :check_scmsync, only: %i[statistics requests]
20-
before_action :check_scmsync, only: %i[users revisions], unless: -> { Flipper.enabled?(:scmsync, User.session) }
19+
before_action :check_scmsync, only: %i[statistics users requests revisions],
20+
unless: -> { action_name.in?(%w[users revisions]) && Flipper.enabled?(:scmsync, User.session) }
2121

2222
before_action :set_package, only: %i[edit update show requests statistics revisions
2323
branch_diff_info rdiff remove

src/api/app/controllers/webui/webui_controller.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ def set_package
101101
return if @package_name.blank?
102102

103103
begin
104-
@package = Package.get_by_project_and_name(@project.name, @package_name, follow_multibuild: true, follow_project_scmsync_links: true)
104+
@package = Package.get_by_project_and_name(@project.name, @package_name,
105+
follow_multibuild: true,
106+
follow_project_scmsync_links: Flipper.enabled?(:scmsync, User.session))
105107
# why it's not found is of no concern
106108
rescue APIError
107109
raise Package::UnknownObjectError, "Package not found: #{@project.name}/#{@package_name}"

src/api/app/models/project.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ def very_important_projects_with_categories
420420
# class_methods
421421
end
422422

423-
def backend_packages
423+
def backend_only_packages
424424
Nokogiri::XML(Backend::Api::Search.packages_for_project(name)).xpath('//package').map do |package|
425425
Package.get_by_project_and_name(name, package['name'], follow_multibuild: true, follow_project_scmsync_links: true)
426426
end

src/api/app/policies/assignment_policy.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# checked as Assignment model validation.
44
class AssignmentPolicy < ApplicationPolicy
55
def create?
6-
return false if record.package.readonly?
76
return false unless Flipper.enabled?(:foster_collaboration, user)
87

98
return true if user.admin?

src/api/app/views/webui/package/_tabs.html.haml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
- if Flipper.enabled?(:request_show_redesign, User.session)
1111
= tab_link('RPM Lint', rpmlint_result_path(project, package), 'scrollable-tab-link')
1212
= tab_link('Revisions', package_view_revisions_path(project, package), 'scrollable-tab-link')
13-
- if Flipper.enabled?(:request_index, User.session)
14-
= tab_link('Requests', packages_requests_path(project,
15-
package,
16-
state: %w[new review]),
17-
'scrollable-tab-link', active: controller_name == 'bs_requests')
18-
- else
19-
= tab_link('Requests', package_requests_path(project, package), 'scrollable-tab-link')
13+
- unless package.readonly?
14+
- if Flipper.enabled?(:request_index, User.session)
15+
= tab_link('Requests', packages_requests_path(project,
16+
package,
17+
state: %w[new review]),
18+
'scrollable-tab-link', active: controller_name == 'bs_requests')
19+
- else
20+
= tab_link('Requests', package_requests_path(project, package), 'scrollable-tab-link')
2021
= tab_link('Users', package_users_path(project, package), 'scrollable-tab-link')
21-
= tab_link('Attributes', index_attribs_path(project, package), 'scrollable-tab-link')
22+
- unless package.readonly?
23+
= tab_link('Attributes', index_attribs_path(project, package), 'scrollable-tab-link')
2224
= tab_link('Meta', project_package_meta_path(project, package), 'scrollable-tab-link')

src/api/app/views/webui/package/side_links/_assignments.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
%p.mb-0.link-danger
99
%i.fas.fa-user-minus
1010
Unassign
11-
- elsif policy(Assignment.new(package: package, assigner: User.session!)).create?
11+
- elsif !package.readonly?
1212
.dropdown#assignment-search
1313
%button.btn.btn-sm.dropdown-toggle.ps-0.border-0{ data: { 'bs-toggle': 'dropdown', 'bs-auto-close': 'outside' }, aria: { expanded: 'false' } }
1414
%strong

src/api/app/views/webui/project/_project_packages.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
%th Name
1515
%th SCM
1616
%tbody
17-
- project.backend_packages.each do |package|
17+
- project.backend_only_packages.each do |package|
1818
%tr
1919
%td
2020
= link_to(package.name, package_show_path(project, package.name))

src/api/app/views/webui/project/show.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
Packages
4747
%span.badge.text-bg-primary
4848
- if @project.scmsync.present? && Flipper.enabled?(:scmsync, User.session)
49-
= @project.backend_packages.count
49+
= @project.backend_only_packages.count
5050
- else
5151
= @packages.length
5252
- if @inherited_packages.present?

0 commit comments

Comments
 (0)