Skip to content

Commit 9c15c42

Browse files
committed
modified code as review comment
1 parent d80ba20 commit 9c15c42

File tree

2 files changed

+19
-22
lines changed

2 files changed

+19
-22
lines changed

src/main/scala/gitbucket/gist/controller/GistController.scala

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@ trait GistControllerBase extends ControllerBase {
7070
_gist(params("userName"), Some(params("repoName")))
7171
}
7272

73+
get("/gist/:userName/:repoName.js"){
74+
val userName = params("userName")
75+
val repoName = params("repoName")
76+
getGist(userName, repoName) match {
77+
case Some(gist) =>
78+
_embedJs(gist, userName, repoName, "master")
79+
case None =>
80+
NotFound()
81+
}
82+
}
83+
7384
get("/gist/:userName/:repoName/:revision"){
7485
_gist(params("userName"), Some(params("repoName")), params("revision"))
7586
}
@@ -417,12 +428,7 @@ trait GistControllerBase extends ControllerBase {
417428
////////////////////////////////////////////////////////////////////////////////
418429

419430

420-
private def _gist(userName: String, repoName: Option[String] = None, revision: String = "master", isEmbed: Boolean = false): Any = {
421-
422-
if( repoName.isDefined && repoName.get.endsWith(".js")) {
423-
return _gist(userName, Some(repoName.get.substring(0,repoName.get.length()-3)), revision, true)
424-
}
425-
431+
private def _gist(userName: String, repoName: Option[String] = None, revision: String = "master"): Any = {
426432
repoName match {
427433
case None => {
428434
val page = params.get("page") match {
@@ -450,14 +456,11 @@ trait GistControllerBase extends ControllerBase {
450456
case Some(gist) =>
451457
if(gist.mode == "PRIVATE"){
452458
context.loginAccount match {
453-
case Some(x) if(x.userName == userName) =>
454-
if(isEmbed) _embedJs(gist, userName, repoName, revision)
455-
else _gistDetail(gist, userName, repoName, revision)
459+
case Some(x) if(x.userName == userName) => _gistDetail(gist, userName, repoName, revision)
456460
case _ => Unauthorized()
457461
}
458462
} else {
459-
if(isEmbed) _embedJs(gist, userName, repoName, revision)
460-
else _gistDetail(gist, userName, repoName, revision)
463+
_gistDetail(gist, userName, repoName, revision)
461464
}
462465
case None =>
463466
NotFound()

src/main/twirl/gitbucket/gist/detail.scala.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
files: Seq[(String, String)]
55
)(implicit context: gitbucket.core.controller.Context)
66
@import gitbucket.core.view.helpers
7-
@import play.twirl.api.Html
8-
@bootstrapCSS={<link href="@helpers.assets("/vendors/bootstrap-3.3.6/css/bootstrap.css")" rel="stylesheet">}
9-
@prettifyCSS={<link href="@helpers.assets("/vendors/google-code-prettify/prettify.css")" rel="stylesheet">}
10-
@gistCSS={<link href="@context.path/plugin-assets/gist/style.css" rel="stylesheet">}
11-
@gitbucketCSS={<link href="@helpers.assets("/common/css/gitbucket.css")" rel="stylesheet">}
12-
@adminLTECSS={<link href="@helpers.assets("/vendors/AdminLTE-2.3.8/css/AdminLTE.min.css")" rel="stylesheet">}
137
jqueryScript = document.createElement('script');
148
jqueryScript.src = '@helpers.assets("/vendors/jquery/jquery-1.12.2.min.js")';
159
document.head.appendChild(jqueryScript);
@@ -52,9 +46,9 @@ var _html = (function () {/*4f85e035-2513-453b-b435-33f0a12b2339
5246
</div>
5347
4f85e035-2513-453b-b435-33f0a12b2339*/}).toString().replace(/(\n)/g, '').split('4f85e035-2513-453b-b435-33f0a12b2339')[1];
5448

55-
document.write('@bootstrapCSS');
56-
document.write('@prettifyCSS');
57-
document.write('@gistCSS');
58-
document.write('@gitbucketCSS');
59-
document.write('@adminLTECSS');
49+
document.write('<link href="@helpers.assets("/vendors/bootstrap-3.3.6/css/bootstrap.css")" rel="stylesheet">');
50+
document.write('<link href="@helpers.assets("/vendors/google-code-prettify/prettify.css")" rel="stylesheet">');
51+
document.write('<link href="@context.path/plugin-assets/gist/style.css" rel="stylesheet">');
52+
document.write('<link href="@helpers.assets("/common/css/gitbucket.css")" rel="stylesheet">');
53+
document.write('<link href="@helpers.assets("/vendors/AdminLTE-2.3.8/css/AdminLTE.min.css")" rel="stylesheet">');
6054
document.write(_html.replace(/\\r\\n/g,"\n").replace(/\\/g,""));

0 commit comments

Comments
 (0)