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
Tatuya Kamada
gitlab-ce
Commits
1644117a
Commit
1644117a
authored
Feb 18, 2013
by
Andrew8xx8
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue uses StateMachine now
parent
0b512af8
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
134 additions
and
135 deletions
+134
-135
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+1
-1
app/models/issue.rb
app/models/issue.rb
+21
-3
app/models/project.rb
app/models/project.rb
+1
-1
app/observers/issue_observer.rb
app/observers/issue_observer.rb
+19
-10
app/views/issues/_show.html.haml
app/views/issues/_show.html.haml
+3
-3
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+4
-4
lib/api/entities.rb
lib/api/entities.rb
+3
-4
lib/api/issues.rb
lib/api/issues.rb
+2
-2
spec/factories.rb
spec/factories.rb
+6
-1
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+1
-1
spec/observers/issue_observer_spec.rb
spec/observers/issue_observer_spec.rb
+59
-100
spec/requests/api/issues_spec.rb
spec/requests/api/issues_spec.rb
+13
-3
spec/requests/issues_spec.rb
spec/requests/issues_spec.rb
+1
-2
No files found.
app/helpers/issues_helper.rb
View file @
1644117a
...
...
@@ -6,7 +6,7 @@ module IssuesHelper
def
issue_css_classes
issue
classes
=
"issue"
classes
<<
" closed"
if
issue
.
closed
classes
<<
" closed"
if
issue
.
closed
?
classes
<<
" today"
if
issue
.
today?
classes
end
...
...
app/models/issue.rb
View file @
1644117a
...
...
@@ -9,7 +9,7 @@
# project_id :integer
# created_at :datetime not null
# updated_at :datetime not null
#
closed :boolean
default(FALSE), not null
#
state :string
default(FALSE), not null
# position :integer default(0)
# branch_name :string(255)
# description :text
...
...
@@ -19,11 +19,29 @@
class
Issue
<
ActiveRecord
::
Base
include
Issuable
attr_accessible
:title
,
:assignee_id
,
:closed
,
:position
,
:description
,
:milestone_id
,
:label_list
,
:author_id_of_changes
attr_accessible
:title
,
:assignee_id
,
:position
,
:description
,
:milestone_id
,
:label_list
,
:author_id_of_changes
,
:state_event
acts_as_taggable_on
:labels
state_machine
:state
,
:initial
=>
:opened
do
event
:close
do
transition
[
:reopened
,
:opened
]
=>
:closed
end
event
:reopen
do
transition
:closed
=>
:reopened
end
state
:opened
state
:reopened
state
:closed
end
def
self
.
open_for
(
user
)
opened
.
assigned
(
user
)
end
...
...
app/models/project.rb
View file @
1644117a
...
...
@@ -43,7 +43,7 @@ class Project < ActiveRecord::Base
has_many
:events
,
dependent: :destroy
has_many
:merge_requests
,
dependent: :destroy
has_many
:issues
,
dependent: :destroy
,
order:
"
closed
, created_at DESC"
has_many
:issues
,
dependent: :destroy
,
order:
"
state
, created_at DESC"
has_many
:milestones
,
dependent: :destroy
has_many
:users_projects
,
dependent: :destroy
has_many
:notes
,
dependent: :destroy
...
...
app/observers/issue_observer.rb
View file @
1644117a
...
...
@@ -7,22 +7,31 @@ class IssueObserver < ActiveRecord::Observer
end
end
def
after_
update
(
issue
)
def
after_
close
(
issue
,
transition
)
send_reassigned_email
(
issue
)
if
issue
.
is_being_reassigned?
status
=
nil
status
=
'closed'
if
issue
.
is_being_closed?
status
=
'reopened'
if
issue
.
is_being_reopened?
if
status
Note
.
create_status_change_note
(
issue
,
current_user
,
status
)
[
issue
.
author
,
issue
.
assignee
].
compact
.
each
do
|
recipient
|
Notify
.
delay
.
issue_status_changed_email
(
recipient
.
id
,
issue
.
id
,
status
,
current_user
.
id
)
end
end
create_note
(
issue
)
end
def
after_reopen
(
issue
,
transition
)
send_reassigned_email
(
issue
)
if
issue
.
is_being_reassigned?
create_note
(
issue
)
end
def
after_update
(
issue
)
send_reassigned_email
(
issue
)
if
issue
.
is_being_reassigned?
end
protected
def
create_note
(
issue
)
Note
.
create_status_change_note
(
issue
,
current_user
,
issue
.
state
)
[
issue
.
author
,
issue
.
assignee
].
compact
.
each
do
|
recipient
|
Notify
.
delay
.
issue_status_changed_email
(
recipient
.
id
,
issue
.
id
,
issue
.
state
,
current_user
.
id
)
end
end
def
send_reassigned_email
(
issue
)
recipient_ids
=
[
issue
.
assignee_id
,
issue
.
assignee_id_was
].
keep_if
{
|
id
|
id
&&
id
!=
current_user
.
id
}
...
...
app/views/issues/_show.html.haml
View file @
1644117a
...
...
@@ -8,10 +8,10 @@
%i
.icon-comment
=
issue
.
notes
.
count
-
if
can?
current_user
,
:modify_issue
,
issue
-
if
issue
.
closed
=
link_to
'Reopen'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
closed:
false
},
status_only:
true
),
method: :put
,
class:
"btn btn-small grouped reopen_issue"
,
remote:
true
-
if
issue
.
closed
?
=
link_to
'Reopen'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
state: :reopened
},
status_only:
true
),
method: :put
,
class:
"btn btn-small grouped reopen_issue"
,
remote:
true
-
else
=
link_to
'Close'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
closed:
true
},
status_only:
true
),
method: :put
,
class:
"btn btn-small grouped close_issue"
,
remote:
true
=
link_to
'Close'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
state: :closed
},
status_only:
true
),
method: :put
,
class:
"btn btn-small grouped close_issue"
,
remote:
true
=
link_to
edit_project_issue_path
(
issue
.
project
,
issue
),
class:
"btn btn-small edit-issue-link grouped"
do
%i
.icon-edit
Edit
...
...
app/views/issues/show.html.haml
View file @
1644117a
...
...
@@ -7,10 +7,10 @@
%span
.pull-right
-
if
can?
(
current_user
,
:admin_project
,
@project
)
||
@issue
.
author
==
current_user
-
if
@issue
.
closed
=
link_to
'Reopen'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
closed:
false
},
status_only:
true
),
method: :put
,
class:
"btn grouped reopen_issue"
-
if
@issue
.
closed
?
=
link_to
'Reopen'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
state: :reopened
},
status_only:
true
),
method: :put
,
class:
"btn grouped reopen_issue"
-
else
=
link_to
'Close'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
closed:
true
},
status_only:
true
),
method: :put
,
class:
"btn grouped close_issue"
,
title:
"Close Issue"
=
link_to
'Close'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
state: :closed
},
status_only:
true
),
method: :put
,
class:
"btn grouped close_issue"
,
title:
"Close Issue"
-
if
can?
(
current_user
,
:admin_project
,
@project
)
||
@issue
.
author
==
current_user
=
link_to
edit_project_issue_path
(
@project
,
@issue
),
class:
"btn grouped"
do
%i
.icon-edit
...
...
@@ -27,7 +27,7 @@
.ui-box.ui-box-show
.ui-box-head
%h4
.box-title
-
if
@issue
.
closed
-
if
@issue
.
closed
?
.error.status_info
Closed
=
gfm
escape_once
(
@issue
.
title
)
...
...
lib/api/entities.rb
View file @
1644117a
...
...
@@ -35,12 +35,11 @@ module Gitlab
class
Group
<
Grape
::
Entity
expose
:id
,
:name
,
:path
,
:owner_id
end
class
GroupDetail
<
Group
expose
:projects
,
using:
Entities
::
Project
end
class
RepoObject
<
Grape
::
Entity
expose
:name
,
:commit
expose
:protected
do
|
repo
,
options
|
...
...
@@ -63,7 +62,7 @@ module Gitlab
class
Milestone
<
Grape
::
Entity
expose
:id
expose
(
:project_id
)
{
|
milestone
|
milestone
.
project
.
id
}
expose
:title
,
:description
,
:due_date
,
:
closed
,
:updated_at
,
:created_at
expose
:title
,
:description
,
:due_date
,
:
state
,
:updated_at
,
:created_at
end
class
Issue
<
Grape
::
Entity
...
...
@@ -73,7 +72,7 @@ module Gitlab
expose
:label_list
,
as: :labels
expose
:milestone
,
using:
Entities
::
Milestone
expose
:assignee
,
:author
,
using:
Entities
::
UserBasic
expose
:
closed
,
:updated_at
,
:created_at
expose
:
state
,
:updated_at
,
:created_at
end
class
SSHKey
<
Grape
::
Entity
...
...
lib/api/issues.rb
View file @
1644117a
...
...
@@ -69,14 +69,14 @@ module Gitlab
# assignee_id (optional) - The ID of a user to assign issue
# milestone_id (optional) - The ID of a milestone to assign issue
# labels (optional) - The labels of an issue
#
closed (optional) - The state of an issue (0 = false, 1 = true
)
#
state (optional) - The state of an issue (close|reopen
)
# Example Request:
# PUT /projects/:id/issues/:issue_id
put
":id/issues/:issue_id"
do
@issue
=
user_project
.
issues
.
find
(
params
[
:issue_id
])
authorize!
:modify_issue
,
@issue
attrs
=
attributes_for_keys
[
:title
,
:description
,
:assignee_id
,
:milestone_id
,
:
closed
]
attrs
=
attributes_for_keys
[
:title
,
:description
,
:assignee_id
,
:milestone_id
,
:
state_event
]
attrs
[
:label_list
]
=
params
[
:labels
]
if
params
[
:labels
].
present?
IssueObserver
.
current_user
=
current_user
if
@issue
.
update_attributes
attrs
...
...
spec/factories.rb
View file @
1644117a
...
...
@@ -54,10 +54,15 @@ FactoryGirl.define do
project
trait
:closed
do
closed
true
state
:closed
end
trait
:reopened
do
state
:reopened
end
factory
:closed_issue
,
traits:
[
:closed
]
factory
:reopened_issue
,
traits:
[
:reopened
]
end
factory
:merge_request
do
...
...
spec/models/issue_spec.rb
View file @
1644117a
...
...
@@ -9,7 +9,7 @@
# project_id :integer
# created_at :datetime not null
# updated_at :datetime not null
#
closed :boolean
default(FALSE), not null
#
state :string
default(FALSE), not null
# position :integer default(0)
# branch_name :string(255)
# description :text
...
...
spec/observers/issue_observer_spec.rb
View file @
1644117a
This diff is collapsed.
Click to expand it.
spec/requests/api/issues_spec.rb
View file @
1644117a
...
...
@@ -54,14 +54,24 @@ describe Gitlab::API do
end
end
describe
"PUT /projects/:id/issues/:issue_id"
do
describe
"PUT /projects/:id/issues/:issue_id
to update only title
"
do
it
"should update a project issue"
do
put
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
"
,
user
),
title:
'updated title'
,
labels:
'label2'
,
closed:
1
title:
'updated title'
response
.
status
.
should
==
200
json_response
[
'title'
].
should
==
'updated title'
end
end
describe
"PUT /projects/:id/issues/:issue_id to update state and label"
do
it
"should update a project issue"
do
put
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
"
,
user
),
labels:
'label2'
,
state_event:
"close"
response
.
status
.
should
==
200
json_response
[
'labels'
].
should
==
[
'label2'
]
json_response
[
'
closed'
].
should
be_true
json_response
[
'
state'
].
should
eq
"closed"
end
end
...
...
spec/requests/issues_spec.rb
View file @
1644117a
...
...
@@ -58,8 +58,7 @@ describe "Issues" do
it
"should be able to search on different statuses"
do
issue
=
Issue
.
first
# with title 'foobar'
issue
.
closed
=
true
issue
.
save
issue
.
close
visit
project_issues_path
(
project
)
click_link
'Closed'
...
...
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