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
Léo-Paul Géneau
gitlab-ce
Commits
f98e97fe
Commit
f98e97fe
authored
Oct 11, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce duplication between the project and group label forms
parent
00e3c2e0
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6 additions
and
38 deletions
+6
-38
app/controllers/groups/labels_controller.rb
app/controllers/groups/labels_controller.rb
+1
-0
app/views/groups/labels/_form.html.haml
app/views/groups/labels/_form.html.haml
+0
-33
app/views/groups/labels/edit.html.haml
app/views/groups/labels/edit.html.haml
+1
-1
app/views/groups/labels/new.html.haml
app/views/groups/labels/new.html.haml
+1
-1
app/views/projects/labels/edit.html.haml
app/views/projects/labels/edit.html.haml
+1
-1
app/views/projects/labels/new.html.haml
app/views/projects/labels/new.html.haml
+1
-1
app/views/shared/labels/_form.html.haml
app/views/shared/labels/_form.html.haml
+1
-1
No files found.
app/controllers/groups/labels_controller.rb
View file @
f98e97fe
...
@@ -21,6 +21,7 @@ class Groups::LabelsController < Groups::ApplicationController
...
@@ -21,6 +21,7 @@ class Groups::LabelsController < Groups::ApplicationController
def
new
def
new
@label
=
@group
.
labels
.
new
@label
=
@group
.
labels
.
new
@previous_labels_path
=
previous_labels_path
end
end
def
create
def
create
...
...
app/views/groups/labels/_form.html.haml
deleted
100644 → 0
View file @
00e3c2e0
=
form_for
@label
,
as: :label
,
url:
url
,
html:
{
class:
'form-horizontal label-form js-quick-submit js-requires-input'
}
do
|
f
|
=
form_errors
(
@label
)
.form-group
=
f
.
label
:title
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:title
,
class:
"form-control"
,
required:
true
,
autofocus:
true
.form-group
=
f
.
label
:description
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:description
,
class:
"form-control js-quick-submit"
.form-group
=
f
.
label
:color
,
"Background color"
,
class:
'control-label'
.col-sm-10
.input-group
.input-group-addon.label-color-preview
=
f
.
color_field
:color
,
class:
"form-control"
.help-block
Choose any color.
%br
Or you can choose one of suggested colors below
.suggest-colors
-
suggested_colors
.
each
do
|
color
|
=
link_to
'#'
,
style:
"background-color:
#{
color
}
"
,
data:
{
color:
color
}
do
.form-actions
-
if
@label
.
persisted?
=
f
.
submit
'Save changes'
,
class:
'btn btn-save js-save-button'
-
else
=
f
.
submit
'Create Label'
,
class:
'btn btn-create js-save-button'
=
link_to
'Cancel'
,
@previous_labels_path
,
class:
'btn btn-cancel'
app/views/groups/labels/edit.html.haml
View file @
f98e97fe
...
@@ -4,4 +4,4 @@
...
@@ -4,4 +4,4 @@
Edit Label
Edit Label
%hr
%hr
=
render
'
form'
,
url:
group_label_path
(
@group
,
@label
)
=
render
'
shared/labels/form'
,
url:
group_label_path
(
@group
,
@label
),
back_path:
@previous_labels_path
app/views/groups/labels/new.html.haml
View file @
f98e97fe
...
@@ -5,4 +5,4 @@
...
@@ -5,4 +5,4 @@
New Label
New Label
%hr
%hr
=
render
'
form'
,
url:
group
_labels_path
=
render
'
shared/labels/form'
,
url:
group_labels_path
,
back_path:
@previous
_labels_path
app/views/projects/labels/edit.html.haml
View file @
f98e97fe
...
@@ -6,4 +6,4 @@
...
@@ -6,4 +6,4 @@
%h3
.page-title
%h3
.page-title
Edit Label
Edit Label
%hr
%hr
=
render
'
form'
,
url:
namespace_project_label_path
(
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@label
)
=
render
'
shared/labels/form'
,
url:
namespace_project_label_path
(
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@label
),
back_path:
namespace_project_labels_path
(
@project
.
namespace
,
@project
)
app/views/projects/labels/new.html.haml
View file @
f98e97fe
...
@@ -6,4 +6,4 @@
...
@@ -6,4 +6,4 @@
%h3
.page-title
%h3
.page-title
New Label
New Label
%hr
%hr
=
render
'
form'
,
url:
namespace_project_labels_path
(
@project
.
namespace
.
becomes
(
Namespace
)
,
@project
)
=
render
'
shared/labels/form'
,
url:
namespace_project_labels_path
(
@project
.
namespace
.
becomes
(
Namespace
),
@project
),
back_path:
namespace_project_labels_path
(
@project
.
namespace
,
@project
)
app/views/
projects
/labels/_form.html.haml
→
app/views/
shared
/labels/_form.html.haml
View file @
f98e97fe
...
@@ -30,4 +30,4 @@
...
@@ -30,4 +30,4 @@
=
f
.
submit
'Save changes'
,
class:
'btn btn-save js-save-button'
=
f
.
submit
'Save changes'
,
class:
'btn btn-save js-save-button'
-
else
-
else
=
f
.
submit
'Create Label'
,
class:
'btn btn-create js-save-button'
=
f
.
submit
'Create Label'
,
class:
'btn btn-create js-save-button'
=
link_to
'Cancel'
,
namespace_project_labels_path
(
@project
.
namespace
,
@project
)
,
class:
'btn btn-cancel'
=
link_to
'Cancel'
,
back_path
,
class:
'btn btn-cancel'
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