Revert extra validation for duplication between same keys on a submit
This commit is contained in:
parent
3a7176f2f2
commit
5711562e25
1 changed files with 2 additions and 28 deletions
|
@ -1,39 +1,13 @@
|
||||||
module Ci
|
module Ci
|
||||||
class CreatePipelineScheduleService < BaseService
|
class CreatePipelineScheduleService < BaseService
|
||||||
def execute
|
def execute
|
||||||
pipeline_schedule = project.pipeline_schedules.build(pipeline_schedule_params)
|
project.pipeline_schedules.create(pipeline_schedule_params)
|
||||||
|
|
||||||
if variable_keys_duplicated?
|
|
||||||
pipeline_schedule.errors.add('variables.key', "keys are duplicated")
|
|
||||||
|
|
||||||
return pipeline_schedule
|
|
||||||
end
|
|
||||||
|
|
||||||
pipeline_schedule.save
|
|
||||||
pipeline_schedule
|
|
||||||
end
|
|
||||||
|
|
||||||
def update(pipeline_schedule)
|
|
||||||
if variable_keys_duplicated?
|
|
||||||
pipeline_schedule.errors.add('variables.key', "keys are duplicated")
|
|
||||||
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
pipeline_schedule.update(pipeline_schedule_params)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def pipeline_schedule_params
|
def pipeline_schedule_params
|
||||||
@pipeline_schedule_params ||= params.merge(owner: current_user)
|
params.merge(owner: current_user)
|
||||||
end
|
|
||||||
|
|
||||||
def variable_keys_duplicated?
|
|
||||||
attributes = pipeline_schedule_params['variables_attributes']
|
|
||||||
return false unless attributes.is_a?(Array)
|
|
||||||
|
|
||||||
attributes.map { |v| v['key'] }.uniq.length != attributes.length
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue