fix-bug

modules/cloudbrain/cloudbrain.go

@@ -88,11 +88,12 @@ func AdminOrOwnerOrJobCreaterRight(ctx *context.Context) {
 	var ID = ctx.Params(":id")
 	job, err := models.GetCloudbrainByID(ID)
 	if err != nil {
+		log.Error("GetCloudbrainByID failed:%v", err.Error())
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 	}
 	ctx.Cloudbrain = job
 	if !isAdminOrOwnerOrJobCreater(ctx, job, err) {
-
+		log.Error("!isAdminOrOwnerOrJobCreater error:%v", err.Error())
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 	}
 
@@ -102,9 +103,13 @@ func AdminOrJobCreaterRight(ctx *context.Context) {
 
 	var ID = ctx.Params(":id")
 	job, err := models.GetCloudbrainByID(ID)
+	if err != nil {
+		log.Error("GetCloudbrainByID failed:%v", err.Error())
+		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
+	}
 	ctx.Cloudbrain = job
 	if !isAdminOrJobCreater(ctx, job, err) {
-
+		log.Error("!isAdminOrJobCreater error:%v", err.Error())
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 	}
 
@@ -115,11 +120,12 @@ func AdminOrOwnerOrJobCreaterRightForTrain(ctx *context.Context) {
 	var jobID = ctx.Params(":jobid")
 	job, err := models.GetCloudbrainByJobID(jobID)
 	if err != nil {
+		log.Error("GetCloudbrainByJobID failed:%v", err.Error())
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 	}
 	ctx.Cloudbrain = job
 	if !isAdminOrOwnerOrJobCreater(ctx, job, err) {
-
+		log.Error("!isAdminOrOwnerOrJobCreater failed:%v", err.Error())
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 	}
 
@@ -130,11 +136,12 @@ func AdminOrJobCreaterRightForTrain(ctx *context.Context) {
 	var jobID = ctx.Params(":jobid")
 	job, err := models.GetCloudbrainByJobID(jobID)
 	if err != nil {
+		log.Error("GetCloudbrainByJobID failed:%v", err.Error())
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 	}
 	ctx.Cloudbrain = job
 	if !isAdminOrJobCreater(ctx, job, err) {
-
+		log.Error("!isAdminOrJobCreater errot:%v", err.Error())
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 	}
 

routers/routes/routes.go

@@ -999,8 +999,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Post("/restart", reqWechatBindForApi, cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainRestart)
 				m.Get("/rate", reqRepoCloudBrainReader, repo.GetRate)
 				m.Get("/models", reqRepoCloudBrainReader, repo.CloudBrainShowModels)
+				m.Get("/download_model", cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainDownloadModel)
 			})
-			m.Get("/download_model", cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainDownloadModel)
 			m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.CloudBrainNew)
 			m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainCreate)
 

templates/repo/cloudbrain/models/dir_list.tmpl

@@ -6,7 +6,7 @@
           <td class="name four wide">
             <span class="truncate">
                 <span class="octicon octicon-file-directory"></span>
-                <a class="title" href="{{if .IsDir}}{{$.RepoLink}}/cloudbrain/models?parentDir={{.ParenDir}}{{else}}{{$.RepoLink}}/cloudbrain/download_model?parentDir={{.ParenDir}}&fileName={{.FileName}}&jobName={{$.task.JobName}}{{end}}">
+                <a class="title" href="{{if .IsDir}}{{$.RepoLink}}/cloudbrain/{{$.task.ID}}/models?parentDir={{.ParenDir}}{{else}}{{$.RepoLink}}/cloudbrain/{{$.task.ID}}/download_model?parentDir={{.ParenDir}}&fileName={{.FileName}}&jobName={{$.task.JobName}}{{end}}">
                   <span class="fitted">{{if .IsDir}} {{svg "octicon-file-directory" 16}}{{else}}{{svg "octicon-file" 16}}{{end}}</span> {{.FileName}}
                 </a>
             </span>