BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
9afee5ad
Commit
9afee5ad
authored
Oct 25, 2011
by
gitlabhq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add critical status to issues
parent
afe98ae7
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
84 additions
and
10 deletions
+84
-10
projects.css.scss
app/assets/stylesheets/projects.css.scss
+34
-0
issues_controller.rb
app/controllers/issues_controller.rb
+1
-1
issue.rb
app/models/issue.rb
+11
-0
_form.html.haml
app/views/issues/_form.html.haml
+8
-4
_issues.html.haml
app/views/issues/_issues.html.haml
+6
-1
_show.html.haml
app/views/issues/_show.html.haml
+17
-3
20111025134235_add_high_label_to_issue.rb
db/migrate/20111025134235_add_high_label_to_issue.rb
+5
-0
schema.rb
db/schema.rb
+2
-1
No files found.
app/assets/stylesheets/projects.css.scss
View file @
9afee5ad
...
@@ -647,3 +647,37 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
...
@@ -647,3 +647,37 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
background
:
none
repeat
scroll
0
0
#FFBBBB
background
:
none
repeat
scroll
0
0
#FFBBBB
}
}
}
}
.tag
{
@include
round-borders-all
(
4px
);
padding
:
2px
4px
;
border
:none
;
&
.high
{
background
:
#D12F19
;
color
:white
;
}
&
.today
{
background
:
#44aa22
;
color
:white
;
}
&
.yours
{
background
:
#4466cc
;
color
:white
;
}
&
.notes
{
background
:
#2c5c66
;
color
:white
;
}
}
#issues-table
.issue
{
&
.critical
{
td
{
//background: #D12F19;
//color:#fff;
}
}
}
app/controllers/issues_controller.rb
View file @
9afee5ad
...
@@ -12,7 +12,7 @@ class IssuesController < ApplicationController
...
@@ -12,7 +12,7 @@ class IssuesController < ApplicationController
def
index
def
index
@issues
=
case
params
[
:f
].
to_i
@issues
=
case
params
[
:f
].
to_i
when
1
then
@project
.
issues
.
all
when
1
then
@project
.
issues
when
2
then
@project
.
issues
.
closed
when
2
then
@project
.
issues
.
closed
when
3
then
@project
.
issues
.
opened
.
assigned
(
current_user
)
when
3
then
@project
.
issues
.
opened
.
assigned
(
current_user
)
else
@project
.
issues
.
opened
else
@project
.
issues
.
opened
...
...
app/models/issue.rb
View file @
9afee5ad
...
@@ -18,11 +18,22 @@ class Issue < ActiveRecord::Base
...
@@ -18,11 +18,22 @@ class Issue < ActiveRecord::Base
:presence
=>
true
,
:presence
=>
true
,
:length
=>
{
:within
=>
0
..
2000
}
:length
=>
{
:within
=>
0
..
2000
}
scope
:critical
,
where
(
:critical
=>
true
)
scope
:non_critical
,
where
(
:critical
=>
false
)
scope
:opened
,
where
(
:closed
=>
false
)
scope
:opened
,
where
(
:closed
=>
false
)
scope
:closed
,
where
(
:closed
=>
true
)
scope
:closed
,
where
(
:closed
=>
true
)
scope
:assigned
,
lambda
{
|
u
|
where
(
:assignee_id
=>
u
.
id
)}
scope
:assigned
,
lambda
{
|
u
|
where
(
:assignee_id
=>
u
.
id
)}
acts_as_list
acts_as_list
def
today?
Date
.
today
==
created_at
.
to_date
end
def
new?
today?
&&
created_at
==
updated_at
end
end
end
# == Schema Information
# == Schema Information
#
#
...
...
app/views/issues/_form.html.haml
View file @
9afee5ad
...
@@ -5,17 +5,21 @@
...
@@ -5,17 +5,21 @@
-
@issue
.
errors
.
full_messages
.
each
do
|
msg
|
-
@issue
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.span-
6
.span-
8
=
f
.
label
:title
=
f
.
label
:title
=
f
.
text_field
:title
,
:style
=>
"width:450px"
=
f
.
text_field
:title
,
:style
=>
"width:450px"
.span-
6
.span-
8
=
f
.
label
:content
=
f
.
label
:content
=
f
.
text_area
:content
,
:style
=>
"width:450px; height:130px"
=
f
.
text_area
:content
,
:style
=>
"width:450px; height:130px"
.span-
6
.append-bottom
.span-
8
.append-bottom
=
f
.
label
:assignee_id
=
f
.
label
:assignee_id
=
f
.
select
(
:assignee_id
,
@project
.
users
.
all
.
collect
{
|
p
|
[
p
.
name
,
p
.
id
]
},
{
:include_blank
=>
"Select user"
})
=
f
.
select
(
:assignee_id
,
@project
.
users
.
all
.
collect
{
|
p
|
[
p
.
name
,
p
.
id
]
},
{
:include_blank
=>
"Select user"
})
.span-1
=
f
.
label
:critical
,
"Critical"
%br
=
f
.
check_box
:critical
-
unless
@issue
.
new_record?
-
unless
@issue
.
new_record?
.span-
3
.right
.span-
2
.right
=
f
.
label
:closed
=
f
.
label
:closed
%br
%br
=
f
.
check_box
:closed
=
f
.
check_box
:closed
...
...
app/views/issues/_issues.html.haml
View file @
9afee5ad
%table
.round-borders
#issues-table
%table
.round-borders
#issues-table
%tr
%tr
-
if
can?
(
current_user
,
:admin_issue
,
@project
)
&&
!
params
[
:f
]
||
params
[
:f
]
==
"0"
%th
%th
Assignee
%th
Assignee
%th
ID
%th
ID
%th
Title
%th
Title
%th
Closed?
%th
Closed?
%th
%th
-
@issues
.
each
do
|
issue
|
-
@issues
.
critical
.
each
do
|
issue
|
=
render
(
:partial
=>
'show'
,
:locals
=>
{
:issue
=>
issue
})
-
@issues
.
non_critical
.
each
do
|
issue
|
=
render
(
:partial
=>
'show'
,
:locals
=>
{
:issue
=>
issue
})
=
render
(
:partial
=>
'show'
,
:locals
=>
{
:issue
=>
issue
})
app/views/issues/_show.html.haml
View file @
9afee5ad
%tr
{
:id
=>
dom_id
(
issue
),
:class
=>
"issue"
,
:url
=>
project_issue_path
(
@project
,
issue
)
}
%tr
{
:id
=>
dom_id
(
issue
),
:class
=>
"issue #{issue.critical ? "
critical
" : ""}"
,
:url
=>
project_issue_path
(
@project
,
issue
)
}
-
if
can?
(
current_user
,
:admin_issue
,
@project
)
&&
!
params
[
:f
]
||
params
[
:f
]
==
"0"
%td
=
image_tag
"move.png"
,
:class
=>
[
:handle
,
:left
]
%td
%td
=
image_tag
"move.png"
,
:class
=>
[
:handle
,
:left
]
=
image_tag
gravatar_icon
(
issue
.
assignee
.
email
),
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding:0 5px;"
=
image_tag
gravatar_icon
(
issue
.
assignee
.
email
),
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding:0 5px;"
=
truncate
issue
.
assignee
.
name
,
:lenght
=>
20
=
truncate
issue
.
assignee
.
name
,
:lenght
=>
20
%td
##{issue.id}
%td
##{issue.id}
%td
=
html_escape
issue
.
title
%td
=
html_escape
issue
.
title
%br
-
if
issue
.
critical
%span
.tag.high
critical
-
if
issue
.
today?
%span
.tag.today
today
-#- if issue.author == current_user
-#%span.tag.yours yours
-#- if issue.notes.count > 0
-#%span.tag.notes
-#= issue.notes.count
-#notes
%td
%td
-
if
can?
current_user
,
:write_issue
,
@project
-
if
can?
current_user
,
:write_issue
,
@project
=
form_for
([
@project
,
issue
],
:remote
=>
true
)
do
|
f
|
=
form_for
([
@project
,
issue
],
:remote
=>
true
)
do
|
f
|
...
...
db/migrate/20111025134235_add_high_label_to_issue.rb
0 → 100644
View file @
9afee5ad
class
AddHighLabelToIssue
<
ActiveRecord
::
Migration
def
change
add_column
:issues
,
:critical
,
:boolean
,
:default
=>
false
,
:null
=>
false
end
end
db/schema.rb
View file @
9afee5ad
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended to check this file into your version control system.
# It's strongly recommended to check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
:version
=>
2011102
1101550
)
do
ActiveRecord
::
Schema
.
define
(
:version
=>
2011102
5134235
)
do
create_table
"issues"
,
:force
=>
true
do
|
t
|
create_table
"issues"
,
:force
=>
true
do
|
t
|
t
.
string
"title"
t
.
string
"title"
...
@@ -23,6 +23,7 @@ ActiveRecord::Schema.define(:version => 20111021101550) do
...
@@ -23,6 +23,7 @@ ActiveRecord::Schema.define(:version => 20111021101550) do
t
.
datetime
"updated_at"
t
.
datetime
"updated_at"
t
.
boolean
"closed"
,
:default
=>
false
,
:null
=>
false
t
.
boolean
"closed"
,
:default
=>
false
,
:null
=>
false
t
.
integer
"position"
,
:default
=>
0
t
.
integer
"position"
,
:default
=>
0
t
.
boolean
"critical"
,
:default
=>
false
,
:null
=>
false
end
end
create_table
"keys"
,
:force
=>
true
do
|
t
|
create_table
"keys"
,
:force
=>
true
do
|
t
|
...
...
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