Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
507fedf3
Commit
507fedf3
authored
Jun 23, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Controller logic. Delete before modification. Halfway.
parent
06f01073
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
18 deletions
+48
-18
app/controllers/projects/pipeline_schedules_controller.rb
app/controllers/projects/pipeline_schedules_controller.rb
+4
-8
app/models/ci/pipeline_schedule.rb
app/models/ci/pipeline_schedule.rb
+11
-10
app/models/ci/pipeline_schedule_variable.rb
app/models/ci/pipeline_schedule_variable.rb
+1
-0
app/views/projects/pipeline_schedules/_form.html.haml
app/views/projects/pipeline_schedules/_form.html.haml
+32
-0
No files found.
app/controllers/projects/pipeline_schedules_controller.rb
View file @
507fedf3
class
Projects::PipelineSchedulesController
<
Projects
::
ApplicationController
class
Projects::PipelineSchedulesController
<
Projects
::
ApplicationController
before_action
:schedule
,
except:
[
:index
,
:new
,
:create
]
before_action
:authorize_read_pipeline_schedule!
before_action
:authorize_read_pipeline_schedule!
before_action
:authorize_create_pipeline_schedule!
,
only:
[
:new
,
:create
]
before_action
:authorize_create_pipeline_schedule!
,
only:
[
:new
,
:create
]
before_action
:authorize_update_pipeline_schedule!
,
except:
[
:index
,
:new
,
:cre
ate
]
before_action
:authorize_update_pipeline_schedule!
,
only:
[
:edit
,
:take_ownership
,
:upd
ate
]
before_action
:authorize_admin_pipeline_schedule!
,
only:
[
:destroy
]
before_action
:authorize_admin_pipeline_schedule!
,
only:
[
:destroy
]
before_action
:schedule
,
only:
[
:edit
,
:update
,
:destroy
,
:take_ownership
]
def
index
def
index
@scope
=
params
[
:scope
]
@scope
=
params
[
:scope
]
@all_schedules
=
PipelineSchedulesFinder
.
new
(
@project
).
execute
@all_schedules
=
PipelineSchedulesFinder
.
new
(
@project
).
execute
...
@@ -67,10 +67,6 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
...
@@ -67,10 +67,6 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
def
schedule_params
def
schedule_params
params
.
require
(
:schedule
)
params
.
require
(
:schedule
)
.
permit
(
:description
,
:cron
,
:cron_timezone
,
:ref
,
:active
,
.
permit
(
:description
,
:cron
,
:cron_timezone
,
:ref
,
:active
,
variables_attributes:
[
:id
,
:key
,
:value
,
:_destroy
]
)
variables_attributes:
[
:key
,
:value
]
)
end
def
authorize_update_pipeline_schedule!
return
access_denied!
unless
can?
(
current_user
,
:update_pipeline_schedule
,
schedule
)
end
end
end
end
app/models/ci/pipeline_schedule.rb
View file @
507fedf3
...
@@ -9,17 +9,13 @@ module Ci
...
@@ -9,17 +9,13 @@ module Ci
belongs_to
:owner
,
class_name:
'User'
belongs_to
:owner
,
class_name:
'User'
has_one
:last_pipeline
,
->
{
order
(
id: :desc
)
},
class_name:
'Ci::Pipeline'
has_one
:last_pipeline
,
->
{
order
(
id: :desc
)
},
class_name:
'Ci::Pipeline'
has_many
:pipelines
has_many
:pipelines
has_many
:variables
,
class_name:
'Ci::PipelineScheduleVariable'
has_many
:variables
,
:dependent
=>
:destroy
,
class_name:
'Ci::PipelineScheduleVariable'
validates
:cron
,
unless: :importing?
,
cron:
true
,
presence:
{
unless: :importing?
}
validates
:cron
,
unless: :importing?
,
cron:
true
,
presence:
{
unless: :importing?
}
validates
:cron_timezone
,
cron_timezone:
true
,
presence:
{
unless: :importing?
}
validates
:cron_timezone
,
cron_timezone:
true
,
presence:
{
unless: :importing?
}
validates
:ref
,
presence:
{
unless: :importing?
}
validates
:ref
,
presence:
{
unless: :importing?
}
validates
:description
,
presence:
true
validates
:description
,
presence:
true
validates
:variables
,
uniqueness_of_in_memory:
{
validates_associated
:variables
:collection
=>
:variables
,
:attrs
=>
[
:pipeline_schedule_id
,
:key
],
:message
=>
[
'variables.key'
,
'keys are duplicated'
]
}
before_save
:set_next_run_at
before_save
:set_next_run_at
...
@@ -28,6 +24,15 @@ module Ci
...
@@ -28,6 +24,15 @@ module Ci
accepts_nested_attributes_for
:variables
,
allow_destroy:
true
accepts_nested_attributes_for
:variables
,
allow_destroy:
true
before_validation
(
on: :update
)
do
# TODO: if validation failed, restore the deleted_obj
deleted_obj
=
Ci
::
PipelineScheduleVariable
.
where
(
pipeline_schedule_id:
self
).
destroy_all
end
after_validation
(
on: :update
)
do
# TODO: if validation failed, restore the deleted_obj
end
def
owned_by?
(
current_user
)
def
owned_by?
(
current_user
)
owner
==
current_user
owner
==
current_user
end
end
...
@@ -64,9 +69,5 @@ module Ci
...
@@ -64,9 +69,5 @@ module Ci
Gitlab
::
Ci
::
CronParser
.
new
(
worker_cron
,
worker_time_zone
)
Gitlab
::
Ci
::
CronParser
.
new
(
worker_cron
,
worker_time_zone
)
.
next_time_from
(
next_run_at
)
.
next_time_from
(
next_run_at
)
end
end
def
job_variables
variables
&
.
map
(
&
:to_runner_variable
)
||
[]
end
end
end
end
end
app/models/ci/pipeline_schedule_variable.rb
View file @
507fedf3
...
@@ -4,6 +4,7 @@ module Ci
...
@@ -4,6 +4,7 @@ module Ci
include
HasVariable
include
HasVariable
belongs_to
:pipeline_schedule
belongs_to
:pipeline_schedule
validates
:key
,
uniqueness:
{
scope: :pipeline_schedule_id
}
validates
:key
,
uniqueness:
{
scope: :pipeline_schedule_id
}
end
end
end
end
app/views/projects/pipeline_schedules/_form.html.haml
View file @
507fedf3
...
@@ -22,6 +22,38 @@
...
@@ -22,6 +22,38 @@
=
f
.
label
:ref
,
_
(
'Target Branch'
),
class:
'label-light'
=
f
.
label
:ref
,
_
(
'Target Branch'
),
class:
'label-light'
=
dropdown_tag
(
_
(
"Select target branch"
),
options:
{
toggle_class:
'btn js-target-branch-dropdown'
,
dropdown_class:
'git-revision-dropdown'
,
title:
_
(
"Select target branch"
),
filter:
true
,
placeholder:
s_
(
"OfSearchInADropdown|Filter"
),
data:
{
data:
@project
.
repository
.
branch_names
,
default_branch:
@project
.
default_branch
}
}
)
=
dropdown_tag
(
_
(
"Select target branch"
),
options:
{
toggle_class:
'btn js-target-branch-dropdown'
,
dropdown_class:
'git-revision-dropdown'
,
title:
_
(
"Select target branch"
),
filter:
true
,
placeholder:
s_
(
"OfSearchInADropdown|Filter"
),
data:
{
data:
@project
.
repository
.
branch_names
,
default_branch:
@project
.
default_branch
}
}
)
=
f
.
text_field
:ref
,
value:
@schedule
.
ref
,
id:
'schedule_ref'
,
class:
'hidden'
,
name:
'schedule[ref]'
,
required:
true
=
f
.
text_field
:ref
,
value:
@schedule
.
ref
,
id:
'schedule_ref'
,
class:
'hidden'
,
name:
'schedule[ref]'
,
required:
true
-# TODO: Test code
=
@schedule
.
variables
.
inspect
-
if
@schedule
.
variables
.
present?
-
@schedule
.
variables
.
each_with_index
do
|
variable
,
i
|
.form-group
.col-md-9
%label
.label-light
Key
%input
.form-control
{
:name
=>
"schedule[variables_attributes][#{i}][key]"
,
:type
=>
"text"
,
:value
=>
variable
.
key
}
/
%p
.gl-field-error.hide
This field is required.
%label
.label-light
Value
%input
.form-control
{
:name
=>
"schedule[variables_attributes][#{i}][value]"
,
:type
=>
"text"
,
:value
=>
variable
.
value
}
/
%p
.gl-field-error.hide
This field is required.
-
if
@schedule
.
variables
.
count
==
1
-
(
1
..
1
).
each
do
|
i
|
.form-group
.col-md-9
%label
.label-light
Key
%input
.form-control
{
:name
=>
"schedule[variables_attributes][#{i}][key]"
,
:type
=>
"text"
}
/
%p
.gl-field-error.hide
This field is required.
%label
.label-light
Value
%input
.form-control
{
:name
=>
"schedule[variables_attributes][#{i}][value]"
,
:type
=>
"text"
}
/
%p
.gl-field-error.hide
This field is required.
-
else
-
(
0
..
0
).
each
do
|
i
|
.form-group
.col-md-9
%label
.label-light
Key
%input
.form-control
{
:name
=>
"schedule[variables_attributes][#{i}][key]"
,
:type
=>
"text"
}
/
%p
.gl-field-error.hide
This field is required.
%label
.label-light
Value
%input
.form-control
{
:name
=>
"schedule[variables_attributes][#{i}][value]"
,
:type
=>
"text"
}
/
%p
.gl-field-error.hide
This field is required.
.form-group
.form-group
.col-md-9
.col-md-9
%label
.label-light
%label
.label-light
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment