Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 15:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #464)Add a new parameter to specify request method for plugin actions

Browse Source
This commit is contained in:
Naoki Takezoe
2014-08-16 16:02:02 +09:00
parent 975dfb17e1
commit a87399f223
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/servlet/PluginActionInvokeFilter.scala
View File

@@ -32,13 +32,15 @@ class PluginActionInvokeFilter extends Filter with SystemSettingsService with Re
private def processGlobalAction(path: String, request: HttpServletRequest, response: HttpServletResponse)
(implicit session: Session): Boolean = {
plugin.PluginSystem.globalActions.find(_.path == path).map { action =>
plugin.PluginSystem.globalActions.find(x =>
x.method.toLowerCase == request.getMethod.toLowerCase && x.path == path
).map { action =>
val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
val systemSettings = loadSystemSettings()
implicit val context = app.Context(systemSettings, Option(loginAccount), request)
if(authenticate(action.security, context)){
val result = action.function(request, response)
val result = action.function(request, response, context)
result match {
case x: String => renderGlobalHtml(request, response, context, x)
case x: Html => renderGlobalHtml(request, response, context, x.toString)
@@ -68,7 +70,7 @@ class PluginActionInvokeFilter extends Filter with SystemSettingsService with Re
if(authenticate(action.security, context, repository)){
val result = try {
PluginConnectionHolder.threadLocal.set(session.conn)
action.function(request, response, repository)
action.function(request, response, context, repository)
} finally {
PluginConnectionHolder.threadLocal.remove()
}