diff --git a/routers/dataset/dataset.go b/routers/dataset/dataset.go index 1cb8f14a7..b9d0efb05 100644 --- a/routers/dataset/dataset.go +++ b/routers/dataset/dataset.go @@ -8,10 +8,12 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers/repo" + "github.com/unknwon/com" ) const ( tplDataSet base.TplName = "datasets/index" + tplShow base.TplName = "datasets/show" tplCreate base.TplName = "datasets/create" ) @@ -119,16 +121,34 @@ func CreatePost(ctx *context.Context, form auth.CreateDatasetForm) { if err == nil { log.Trace("Dataset created [%d]: %s/%s", opts.ID, ctxUser.Name, opts.Title) - ctx.Redirect(setting.AppSubURL + "/datasets") + ctx.Redirect(setting.AppSubURL + "/datasets/" + com.ToStr(opts.ID)) return } // handleCreateError(ctx, ctxUser, err, "CreatePost", tplCreate, &form) } +func Show(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("dataset.show_dataset") + + rel, err := models.GetDatasetByID(ctx.ParamsInt64((":id"))) + if err != nil { + ctx.ServerError("GetDataset", err) + return + } + + ctx.Data["title"] = rel.Title + ctx.Data["description"] = rel.Description + ctx.Data["category"] = rel.Category + ctx.Data["task"] = rel.Task + ctx.Data["license"] = rel.License + + ctx.HTML(200, tplShow) +} + // EditRelease render release edit page func EditDataset(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.dataset.edit_release") + ctx.Data["Title"] = ctx.Tr("dataset.edit_dataset") ctx.Data["PageIsEditDataset"] = true repo.RenderAttachmentSettings(ctx) rel, err := models.GetDatasetByID(ctx.ParamsInt64(":id")) @@ -147,7 +167,7 @@ func EditDataset(ctx *context.Context) { } func EditDatasetPost(ctx *context.Context, form auth.EditDatasetForm) { - ctx.Data["Title"] = ctx.Tr("repo.dataset.edit_release") + ctx.Data["Title"] = ctx.Tr("dataset.edit_dataset") ctx.Data["PageIsEditDataset"] = true rel, err := models.GetDatasetByID(ctx.ParamsInt64(":id")) @@ -184,8 +204,9 @@ func EditDatasetPost(ctx *context.Context, form auth.EditDatasetForm) { if err = models.AddDatasetAttachments(rel.ID, attachmentUUIDs); err != nil { log.Error("%v", err) } + log.Trace("Dataset updated: %d", rel.ID) - ctx.Redirect(setting.AppSubURL + "/datasets") + ctx.Redirect(setting.AppSubURL + "/datasets/" + com.ToStr(rel.ID)) } func Delete(ctx *context.Context) { diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 3e15b8432..df27139e4 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -1006,6 +1006,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/create", dataset.Create) m.Post("/create", bindIgnErr(auth.CreateDatasetForm{}), dataset.CreatePost) m.Post("/delete", dataset.Delete) + m.Get("/:id", dataset.Show) m.Get("/edit/:id", dataset.EditDataset) m.Post("/edit/:id", bindIgnErr(auth.EditDatasetForm{}), dataset.EditDatasetPost) }, ignSignIn) diff --git a/templates/datasets/dataset_list.tmpl b/templates/datasets/dataset_list.tmpl index f3c614980..88bb71158 100644 --- a/templates/datasets/dataset_list.tmpl +++ b/templates/datasets/dataset_list.tmpl @@ -2,7 +2,7 @@ {{range .datasets}}
- + {{.Title}}
diff --git a/templates/datasets/show.tmpl b/templates/datasets/show.tmpl new file mode 100644 index 000000000..290212268 --- /dev/null +++ b/templates/datasets/show.tmpl @@ -0,0 +1,3 @@ +{{template "base/head" .}} +

{{.Title}}

+{{template "base/footer" .}} \ No newline at end of file