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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
68a31780
Commit
68a31780
authored
Apr 16, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/project_labels' of /home/git/repositories/gitlab/gitlabhq
parents
880cb8aa
133d7822
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
1 deletion
+39
-1
app/assets/stylesheets/gitlab_bootstrap/lists.scss
app/assets/stylesheets/gitlab_bootstrap/lists.scss
+9
-0
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+1
-0
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+4
-0
app/models/project.rb
app/models/project.rb
+3
-1
app/views/dashboard/projects.html.haml
app/views/dashboard/projects.html.haml
+13
-0
app/views/projects/_form.html.haml
app/views/projects/_form.html.haml
+9
-0
No files found.
app/assets/stylesheets/gitlab_bootstrap/lists.scss
View file @
68a31780
...
@@ -69,5 +69,14 @@ ul.bordered-list {
...
@@ -69,5 +69,14 @@ ul.bordered-list {
display
:
block
;
display
:
block
;
margin
:
0px
;
margin
:
0px
;
&
:last-child
{
border
:none
}
&
:last-child
{
border
:none
}
&
.active
{
background
:
#f9f9f9
;
a
{
font-weight
:
bold
;
}
}
&
.light
{
a
{
color
:
#777
;
}
}
}
}
}
}
app/controllers/dashboard_controller.rb
View file @
68a31780
...
@@ -34,6 +34,7 @@ class DashboardController < ApplicationController
...
@@ -34,6 +34,7 @@ class DashboardController < ApplicationController
@projects
@projects
end
end
@projects
=
@projects
.
tagged_with
(
params
[
:label
])
if
params
[
:label
].
present?
@projects
=
@projects
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@projects
=
@projects
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
30
)
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
30
)
end
end
...
...
app/helpers/projects_helper.rb
View file @
68a31780
...
@@ -3,6 +3,10 @@ module ProjectsHelper
...
@@ -3,6 +3,10 @@ module ProjectsHelper
"You are going to remove
#{
user
.
name
}
from
#{
project
.
name
}
project team. Are you sure?"
"You are going to remove
#{
user
.
name
}
from
#{
project
.
name
}
project team. Are you sure?"
end
end
def
projects_labels
Project
.
tag_counts_on
(
:labels
).
map
(
&
:name
)
end
def
link_to_project
project
def
link_to_project
project
link_to
project
do
link_to
project
do
title
=
content_tag
(
:strong
,
project
.
name
)
title
=
content_tag
(
:strong
,
project
.
name
)
...
...
app/models/project.rb
View file @
68a31780
...
@@ -28,12 +28,14 @@ class Project < ActiveRecord::Base
...
@@ -28,12 +28,14 @@ class Project < ActiveRecord::Base
include
Gitlab
::
ShellAdapter
include
Gitlab
::
ShellAdapter
extend
Enumerize
extend
Enumerize
attr_accessible
:name
,
:path
,
:description
,
:default_branch
,
:issues_tracker
,
attr_accessible
:name
,
:path
,
:description
,
:default_branch
,
:issues_tracker
,
:label_list
,
:issues_enabled
,
:wall_enabled
,
:merge_requests_enabled
,
:snippets_enabled
,
:issues_tracker_id
,
:issues_enabled
,
:wall_enabled
,
:merge_requests_enabled
,
:snippets_enabled
,
:issues_tracker_id
,
:wiki_enabled
,
:public
,
:import_url
,
:last_activity_at
,
as:
[
:default
,
:admin
]
:wiki_enabled
,
:public
,
:import_url
,
:last_activity_at
,
as:
[
:default
,
:admin
]
attr_accessible
:namespace_id
,
:creator_id
,
as: :admin
attr_accessible
:namespace_id
,
:creator_id
,
as: :admin
acts_as_taggable_on
:labels
attr_accessor
:import_url
attr_accessor
:import_url
# Relations
# Relations
...
...
app/views/dashboard/projects.html.haml
View file @
68a31780
...
@@ -20,6 +20,15 @@
...
@@ -20,6 +20,15 @@
=
nav_tab
:scope
,
'joined'
do
=
nav_tab
:scope
,
'joined'
do
=
link_to
"Joined"
,
projects_dashboard_path
(
scope:
'joined'
)
=
link_to
"Joined"
,
projects_dashboard_path
(
scope:
'joined'
)
%p
.light
Filter by label:
%ul
.bordered-list
-
projects_labels
.
each
do
|
label
|
%li
{
class:
(
label
==
params
[
:label
])
?
'active'
:
'light'
}
=
link_to
projects_dashboard_path
(
scope:
params
[
:scope
],
label:
label
)
do
%i
.icon-tag
=
label
.span9
.span9
=
form_tag
projects_dashboard_path
,
method:
'get'
do
=
form_tag
projects_dashboard_path
,
method:
'get'
do
%fieldset
.dashboard-search-filter
%fieldset
.dashboard-search-filter
...
@@ -49,6 +58,10 @@
...
@@ -49,6 +58,10 @@
.left
.left
-
if
project
.
description
.
present?
-
if
project
.
description
.
present?
%span
.light
=
project
.
description
%span
.light
=
project
.
description
-
project
.
labels
.
each
do
|
label
|
%span
.label.label-info
%i
.icon-tag
=
label
.
name
.pull-right.light
.pull-right.light
%small
.light
%small
.light
...
...
app/views/projects/_form.html.haml
View file @
68a31780
...
@@ -57,6 +57,15 @@
...
@@ -57,6 +57,15 @@
authentication.
authentication.
It will also be listed on the
#{
link_to
"public access directory"
,
public_root_path
}
.
It will also be listed on the
#{
link_to
"public access directory"
,
public_root_path
}
.
%fieldset
.features
%legend
Labels:
.control-group
=
f
.
label
:label_list
,
"Labels"
,
class:
'control-label'
.controls
=
f
.
text_field
:label_list
,
maxlength:
2000
,
class:
"xxlarge"
%p
.hint
Separate with comma.
%fieldset
.features
%fieldset
.features
%legend
%legend
Features:
Features:
...
...
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