Skip to content

Commit

Permalink
[webui][api] remove empty lines
Browse files Browse the repository at this point in the history
  • Loading branch information
evanrolfe committed Feb 17, 2017
1 parent aa2d071 commit ce907c3
Show file tree
Hide file tree
Showing 19 changed files with 3 additions and 32 deletions.
2 changes: 0 additions & 2 deletions src/api/app/controllers/tag_controller.rb
Expand Up @@ -131,7 +131,6 @@ def get_tags_by_user_and_project( do_render = true )

@tags = @project.tags.where("taggings.user_id = ?", user.id).order(:name)
return @tags unless do_render

render partial: "tags"
end

Expand All @@ -145,7 +144,6 @@ def get_tags_by_user_and_package( do_render = true )

@tags = @package.tags.where("taggings.user_id = ?", user.id).order(:name)
return @tags unless do_render

render partial: "tags"
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/controllers/webui/attribute_controller.rb
Expand Up @@ -25,7 +25,6 @@ def new
def edit
authorize @attribute
return unless @attribute.attrib_type.value_count && ( @attribute.attrib_type.value_count > @attribute.values.length )

(@attribute.attrib_type.value_count - @attribute.values.length).times { @attribute.values.build(attrib: @attribute) }
end

Expand Down
3 changes: 0 additions & 3 deletions src/api/app/controllers/webui/package_controller.rb
Expand Up @@ -128,7 +128,6 @@ def dependency
filename: params[:dname], view: 'fileinfo_ext')
@durl = nil
return if @fileinfo # avoid displaying an error for non-existing packages

redirect_back(fallback_location: { action: :binary, project: params[:project], package: params[:package],
repository: @repository, arch: @arch, filename: @filename })
end
Expand Down Expand Up @@ -347,7 +346,6 @@ def set_linkinfo
@linkinfo = nil
lt = @package.backend_package.links_to
return unless lt

@linkinfo = { package: lt, error: @package.backend_package.error }
@linkinfo[:diff] = true if lt.backend_package.verifymd5 != @package.backend_package.verifymd5
end
Expand Down Expand Up @@ -757,7 +755,6 @@ def view_file
redirect_back(fallback_location: { action: :show, project: @project, package: @package })
return
end

render(template: 'webui/package/simple_file_view') && return if @spider_bot
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/controllers/webui/patchinfo_controller.rb
Expand Up @@ -92,7 +92,6 @@ def read_patchinfo
@reboot = @file.has_element?('reboot_needed')
@zypp_restart_needed = @file.has_element?('zypp_restart_needed')
return unless @file.has_element?('stopped')

@block = true
@block_reason = @file.value(:stopped)
end
Expand Down
1 change: 0 additions & 1 deletion src/api/app/controllers/webui/project_controller.rb
Expand Up @@ -583,7 +583,6 @@ def prjconf

@content = @project.config.to_s(sliced_params.to_h)
return if @content

flash[:error] = @project.config.errors.full_messages.to_sentence
redirect_to controller: 'project', nextstatus: 404
end
Expand Down
1 change: 0 additions & 1 deletion src/api/app/controllers/webui/request_controller.rb
Expand Up @@ -141,7 +141,6 @@ def require_request
required_parameters :number
@req = BsRequest.find_by_number params[:number]
return if @req

flash[:error] = "Can't find request #{params[:number]}"
redirect_back(fallback_location: user_show_path(User.current)) && return
end
Expand Down
1 change: 0 additions & 1 deletion src/api/app/controllers/webui/webui_controller.rb
Expand Up @@ -274,7 +274,6 @@ def require_configuration
# Before filter to check if current user is administrator
def require_admin
return unless User.current.nil? || !User.current.is_admin?

flash[:error] = 'Requires admin privileges'
redirect_back(fallback_location: { controller: 'main', action: 'index' })
end
Expand Down
2 changes: 0 additions & 2 deletions src/api/app/helpers/event_mailer_helper.rb
Expand Up @@ -5,10 +5,8 @@ def project_or_package_text(project, package, opts = {})
else
text = project
end

return unless opts[:short].nil?
return "package #{text}" if package.present?

"project #{text}"
end
end
2 changes: 0 additions & 2 deletions src/api/app/models/branch_package.rb
Expand Up @@ -368,7 +368,6 @@ def expand_rev_to_srcmd5(p)
raise InvalidFilelistError.new 'no such revision' unless dir
p[:rev] = dir.value(:srcmd5)
return if p[:rev]

raise InvalidFilelistError.new 'no srcmd5 revision found'
end

Expand Down Expand Up @@ -592,7 +591,6 @@ def set_target_project
@auto_cleanup = ::Configuration.cleanup_after_days
end
return unless @target_project && !Project.valid_name?(@target_project)

raise InvalidProjectNameError, "invalid project name '#{@target_project}'"
end
end
4 changes: 0 additions & 4 deletions src/api/app/models/bs_request.rb
Expand Up @@ -103,7 +103,6 @@ def check_creator
unless user
errors.add(:creator, "Invalid creator specified #{creator}")
end

return if user.is_active?
errors.add(:creator, "Login #{user.login} is not an active user")
end
Expand Down Expand Up @@ -404,7 +403,6 @@ def permission_check_addreview!
def permission_check_change_groups!
# adding and removing of requests is only allowed for groups
return unless bs_request_actions.first.action_type != :group

raise GroupRequestSpecial.new "Command is only valid for group requests"
end

Expand Down Expand Up @@ -714,7 +712,6 @@ def change_review_state(new_review_state, opts = {})

def check_if_valid_review!(opts)
return unless !opts[:by_user] && !opts[:by_group] && !opts[:by_project]

raise InvalidReview.new
end

Expand Down Expand Up @@ -797,7 +794,6 @@ def setincident(incident)
end

return unless touched

save!
HistoryElement::RequestSetIncident.create(p)
end
Expand Down
Expand Up @@ -130,7 +130,6 @@ def check_permissions!
# creating release requests is also locking the source package, therefore we require write access there.
spkg = Package.find_by_project_and_name source_project, source_package
return if spkg || !User.current.can_modify_package?(spkg)

raise LackingReleaseMaintainership.new 'Creating a release request action requires maintainership in source package'
end

Expand Down
6 changes: 3 additions & 3 deletions src/api/app/models/bs_request_permission_check.rb
Expand Up @@ -163,9 +163,9 @@ def check_action_target(action)
end
# maintenance incident target permission checks
return unless action.is_maintenance_incident?
unless @target_project.kind.in?(["maintenance", "maintenance_incident"])
raise TargetNotMaintenance.new "The target project is not of type maintenance or incident but #{@target_project.kind}"
end
return if @target_project.kind.in?(["maintenance", "maintenance_incident"])

raise TargetNotMaintenance.new "The target project is not of type maintenance or incident but #{@target_project.kind}"
end

def set_permissions_for_action(action, new_state = nil)
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/buildresult.rb
Expand Up @@ -51,7 +51,6 @@ def self.avail_status_values
def self.code2index(code)
index = AVAIL_STATUS_VALUES[code.to_sym]
return index if index

raise ArgumentError, "code '#{code}' unknown #{AVAIL_STATUS_VALUES.inspect}"
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/download_repository.rb
Expand Up @@ -16,7 +16,6 @@ def architecture_inclusion
# Workaround for rspec validation test (validate_presence_of(:repository_id))
return unless repository
return if repository.architectures.pluck(:name).include?(arch)

errors.add(:base, "Architecture has to be available via repository association.")
end
end
1 change: 0 additions & 1 deletion src/api/app/models/issue_tracker.rb
Expand Up @@ -345,7 +345,6 @@ def start_element(name, attrs = [])

def characters(content)
return unless @@isDesc

@@mySummary += content.chomp
end

Expand Down
4 changes: 0 additions & 4 deletions src/api/app/models/project.rb
Expand Up @@ -456,7 +456,6 @@ def check_write_access!(ignoreLock = nil)

# the can_create_check is inconsistent with package class check_write_access! check
return if check_write_access(ignoreLock)

raise WritePermissionError, "No permission to modify project '#{name}' for user '#{User.current.login}'"
end

Expand Down Expand Up @@ -551,7 +550,6 @@ def can_be_unlocked?(with_exception = true)

unless flags.find_by_flag_and_status('lock', 'enable')
raise ProjectNotLocked.new "project '#{name}' is not locked" if with_exception

errors.add(:base, 'is not locked')
end

Expand Down Expand Up @@ -1549,7 +1547,6 @@ def unlock(comment = nil)
def unlock_by_request(request)
f = flags.find_by_flag_and_status('lock', 'enable')
return unless f

flags.delete(f)
store(comment: "Request got revoked", request: request, lowprio: 1)
end
Expand Down Expand Up @@ -1684,7 +1681,6 @@ def source_file(file, opts = {})
def prepend_kiwi_config
prjconf = source_file('_config')
return if prjconf =~ /^Type:/

prjconf = "%if \"%_repository\" == \"images\"\nType: kiwi\nRepotype: none\nPatterntype: none\n%endif\n" << prjconf
Suse::Backend.put_source(source_path('_config'), prjconf)
end
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/relationship.rb
Expand Up @@ -82,7 +82,6 @@ def self.add_user(obj, user, role, ignoreLock = nil, check = nil)
logger.debug "adding user: #{user.login}, #{role.title}"
r = obj.relationships.build(user: user, role: role)
return unless r.invalid?

logger.debug "invalid: #{r.errors.inspect}"
r.delete
end
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/user.rb
Expand Up @@ -1007,7 +1007,6 @@ def can_modify_project_internal(project, ignoreLock)
# "password_salt" property's value to make the hashing more secure.
def hash_string(value)
return unless password_hash_type == "md5"

Digest::MD5.hexdigest(value + password_salt)
end

Expand Down
1 change: 0 additions & 1 deletion src/api/test/functional/webui/users_test.rb
Expand Up @@ -99,7 +99,6 @@ def test_add_and_edit_project_users # spec/support/shared_examples/features/user

def edit_role(cell, new_value)
return if new_value.nil?

input = cell.first(:css, 'input')
input.click unless input.selected? == new_value
end
Expand Down

0 comments on commit ce907c3

Please sign in to comment.