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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
215a01f6
Commit
215a01f6
authored
Feb 24, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move notes login to one controller
parent
81092c01
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
55 additions
and
46 deletions
+55
-46
app/assets/javascripts/note.js
app/assets/javascripts/note.js
+16
-11
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+0
-12
app/controllers/commits_controller.rb
app/controllers/commits_controller.rb
+0
-7
app/controllers/issues_controller.rb
app/controllers/issues_controller.rb
+1
-2
app/controllers/merge_requests_controller.rb
app/controllers/merge_requests_controller.rb
+1
-2
app/controllers/notes_controller.rb
app/controllers/notes_controller.rb
+30
-0
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+0
-4
app/views/commits/show.html.haml
app/views/commits/show.html.haml
+1
-1
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+1
-1
app/views/merge_requests/show.html.haml
app/views/merge_requests/show.html.haml
+1
-1
app/views/notes/_notes.html.haml
app/views/notes/_notes.html.haml
+2
-2
app/views/notes/index.js.haml
app/views/notes/index.js.haml
+0
-0
app/views/projects/wall.html.haml
app/views/projects/wall.html.haml
+1
-1
app/views/projects/wall.js.haml
app/views/projects/wall.js.haml
+0
-1
config/routes.rb
config/routes.rb
+1
-1
No files found.
app/assets/javascripts/note.js
View file @
215a01f6
var
NoteList
=
{
notes_path
:
null
,
target_params
:
null
,
target_id
:
0
,
target_type
:
null
,
first_id
:
0
,
last_id
:
0
,
resource_name
:
null
,
disable
:
false
,
init
:
function
(
resource_name
,
first_id
,
last_id
)
{
this
.
resource_name
=
resource_name
;
this
.
first_id
=
first_id
;
this
.
last_id
=
last_id
;
function
(
tid
,
tt
,
path
)
{
this
.
notes_path
=
path
+
"
.js
"
;
this
.
target_id
=
tid
;
this
.
target_type
=
tt
;
this
.
target_params
=
"
&target_type=
"
+
this
.
target_type
+
"
&target_id=
"
+
this
.
target_id
this
.
refresh
();
this
.
initRefresh
();
this
.
initLoadMore
();
},
...
...
@@ -19,8 +24,8 @@ getOld:
$
(
'
.loading
'
).
show
();
$
.
ajax
({
type
:
"
GET
"
,
url
:
location
.
href
,
data
:
"
first_id=
"
+
this
.
first_id
,
url
:
this
.
notes_path
,
data
:
"
first_id=
"
+
this
.
first_id
+
this
.
target_params
,
complete
:
function
(){
$
(
'
.loading
'
).
hide
()},
dataType
:
"
script
"
});
},
...
...
@@ -56,8 +61,8 @@ getNew:
// refersh notes list
$
.
ajax
({
type
:
"
GET
"
,
url
:
location
.
href
,
data
:
"
last_id=
"
+
this
.
last_id
,
url
:
this
.
notes_path
,
data
:
"
last_id=
"
+
this
.
last_id
+
this
.
target_params
,
dataType
:
"
script
"
});
},
...
...
@@ -66,8 +71,8 @@ refresh:
// refersh notes list
$
.
ajax
({
type
:
"
GET
"
,
url
:
location
.
href
,
data
:
"
first_id=
"
+
this
.
first_id
+
"
&last_id=
"
+
this
.
last_id
,
url
:
this
.
notes_path
,
data
:
"
first_id=
"
+
this
.
first_id
+
"
&last_id=
"
+
this
.
last_id
+
this
.
target_params
,
dataType
:
"
script
"
});
},
...
...
app/controllers/application_controller.rb
View file @
215a01f6
...
...
@@ -95,18 +95,6 @@ class ApplicationController < ActionController::Base
redirect_to
@project
unless
@project
.
repo_exists?
&&
@project
.
has_commits?
end
def
respond_with_notes
if
params
[
:last_id
]
&&
params
[
:first_id
]
@notes
=
@notes
.
where
(
"id >= ?"
,
params
[
:first_id
])
elsif
params
[
:last_id
]
@notes
=
@notes
.
where
(
"id > ?"
,
params
[
:last_id
])
elsif
params
[
:first_id
]
@notes
=
@notes
.
where
(
"id < ?"
,
params
[
:first_id
])
else
nil
end
end
def
no_cache_headers
response
.
headers
[
"Cache-Control"
]
=
"no-cache, no-store, max-age=0, must-revalidate"
response
.
headers
[
"Pragma"
]
=
"no-cache"
...
...
app/controllers/commits_controller.rb
View file @
215a01f6
...
...
@@ -29,16 +29,9 @@ class CommitsController < ApplicationController
git_not_found!
and
return
unless
@commit
@notes
=
project
.
commit_notes
(
@commit
).
fresh
.
limit
(
20
)
@note
=
@project
.
build_commit_note
(
@commit
)
@comments_allowed
=
true
@line_notes
=
project
.
commit_line_notes
(
@commit
)
respond_to
do
|
format
|
format
.
html
format
.
js
{
respond_with_notes
}
end
end
def
compare
...
...
app/controllers/issues_controller.rb
View file @
215a01f6
...
...
@@ -49,7 +49,6 @@ class IssuesController < ApplicationController
end
def
show
@notes
=
@issue
.
notes
.
inc_author
.
order
(
"created_at DESC"
).
limit
(
20
)
@note
=
@project
.
notes
.
new
(
:noteable
=>
@issue
)
@commits
=
if
@issue
.
branch_name
&&
@project
.
repo
.
heads
.
map
(
&
:name
).
include?
(
@issue
.
branch_name
)
...
...
@@ -61,7 +60,7 @@ class IssuesController < ApplicationController
respond_to
do
|
format
|
format
.
html
format
.
js
{
respond_with_notes
}
format
.
js
end
end
...
...
app/controllers/merge_requests_controller.rb
View file @
215a01f6
...
...
@@ -39,7 +39,6 @@ class MergeRequestsController < ApplicationController
git_not_found!
and
return
end
@notes
=
@merge_request
.
notes
.
inc_author
.
order
(
"created_at DESC"
).
limit
(
20
)
@note
=
@project
.
notes
.
new
(
:noteable
=>
@merge_request
)
@commits
=
@project
.
repo
.
...
...
@@ -52,7 +51,7 @@ class MergeRequestsController < ApplicationController
respond_to
do
|
format
|
format
.
html
format
.
js
{
respond_with_notes
}
format
.
js
end
end
...
...
app/controllers/notes_controller.rb
View file @
215a01f6
...
...
@@ -9,6 +9,23 @@ class NotesController < ApplicationController
respond_to
:js
def
index
@notes
=
case
params
[
:target_type
]
when
"commit"
then
project
.
commit_notes
(
project
.
commit
((
params
[
:target_id
]))).
fresh
.
limit
(
20
)
when
"wall"
then
project
.
common_notes
.
order
(
"created_at DESC"
).
fresh
.
limit
(
20
)
when
"issue"
then
project
.
issues
.
find
(
params
[
:target_id
]).
notes
.
inc_author
.
order
(
"created_at DESC"
).
limit
(
20
)
when
"merge_request"
then
project
.
merge_requests
.
find
(
params
[
:target_id
]).
notes
.
inc_author
.
order
(
"created_at DESC"
).
limit
(
20
)
end
respond_to
do
|
format
|
format
.
js
{
respond_with_notes
}
end
end
def
create
@note
=
@project
.
notes
.
new
(
params
[
:note
])
@note
.
author
=
current_user
...
...
@@ -34,4 +51,17 @@ class NotesController < ApplicationController
end
end
protected
def
respond_with_notes
if
params
[
:last_id
]
&&
params
[
:first_id
]
@notes
=
@notes
.
where
(
"id >= ?"
,
params
[
:first_id
])
elsif
params
[
:last_id
]
@notes
=
@notes
.
where
(
"id > ?"
,
params
[
:last_id
])
elsif
params
[
:first_id
]
@notes
=
@notes
.
where
(
"id < ?"
,
params
[
:first_id
])
else
nil
end
end
end
app/controllers/projects_controller.rb
View file @
215a01f6
...
...
@@ -82,14 +82,10 @@ class ProjectsController < ApplicationController
def
wall
return
render_404
unless
@project
.
wall_enabled
@note
=
Note
.
new
@notes
=
@project
.
common_notes
.
order
(
"created_at DESC"
)
@notes
=
@notes
.
fresh
.
limit
(
20
)
respond_to
do
|
format
|
format
.
html
format
.
js
{
respond_with_notes
}
end
end
...
...
app/views/commits/show.html.haml
View file @
215a01f6
...
...
@@ -21,7 +21,7 @@
%p
.cgray
Showing
#{
pluralize
(
@commit
.
diffs
.
count
,
"changed file"
)
}
=
render
"commits/diffs"
,
:diffs
=>
@commit
.
diffs
=
render
"notes/notes"
=
render
"notes/notes"
,
:tid
=>
@commit
.
id
,
:tt
=>
"commit"
=
render
"notes/per_line_form"
...
...
app/views/issues/show.html.haml
View file @
215a01f6
...
...
@@ -41,5 +41,5 @@
%div
=
simple_format
@issue
.
title
.issue_notes
=
render
"notes/notes"
.issue_notes
=
render
"notes/notes"
,
:tid
=>
@issue
.
id
,
:tt
=>
"issue"
app/views/merge_requests/show.html.haml
View file @
215a01f6
...
...
@@ -63,7 +63,7 @@
%img
{
:src
=>
"/assets/ajax-loader-facebook.gif"
,
:class
=>
"dashboard-loader"
}
.merge-request-notes
.merge_request_notes
=
render
"notes/notes"
.merge_request_notes
=
render
"notes/notes"
,
:tid
=>
@merge_request
.
id
,
:tt
=>
"merge_request"
.loading
{
:style
=>
"display:none;"
}
%center
=
image_tag
"ajax-loader.gif"
.clear
...
...
app/views/notes/_notes.html.haml
View file @
215a01f6
...
...
@@ -2,7 +2,7 @@
=
render
"notes/form"
.clear
%hr
%ul
#notes-list
=
render
"notes/notes_list"
%ul
#notes-list
:javascript
$
(
'
.delete-note
'
).
live
(
'
ajax:success
'
,
function
()
{
...
...
@@ -22,5 +22,5 @@
$
(
'
.attach_holder
'
).
show
();
});
NoteList
.
init
(
"
wall
"
,
#{
@notes
.
last
.
try
(
:id
)
||
0
}
,
#{
@notes
.
first
.
try
(
:id
)
||
0
}
);
NoteList
.
init
(
"
#{
tid
}
"
,
"
#{
tt
}
"
,
"
#{
project_notes_path
(
@project
)
}
"
);
});
app/views/
issues/show
.js.haml
→
app/views/
notes/index
.js.haml
View file @
215a01f6
File moved
app/views/projects/wall.html.haml
View file @
215a01f6
%div
.wall_page
=
render
"notes/notes"
=
render
"notes/notes"
,
:tid
=>
nil
,
:tt
=>
"wall"
.loading
{
:style
=>
"display:none;"
}
%center
=
image_tag
"ajax-loader.gif"
...
...
app/views/projects/wall.js.haml
deleted
100644 → 0
View file @
81092c01
=
render
"notes/load"
config/routes.rb
View file @
215a01f6
...
...
@@ -121,7 +121,7 @@ Gitlab::Application.routes.draw do
get
:search
end
end
resources
:notes
,
:only
=>
[
:create
,
:destroy
]
resources
:notes
,
:only
=>
[
:
index
,
:
create
,
:destroy
]
end
root
:to
=>
"projects#index"
end
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