Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite2a7448

Browse files
authored
fix: allow update of empty template description (#7225)
1 parentea27129 commite2a7448

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

‎cli/templateedit_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,13 @@ func TestTemplateEdit(t *testing.T) {
167167

168168
// Test the cli command.
169169
displayName:="New Display Name 789"
170+
description:="New Description ABC"
170171
icon:="/icons/new-icon.png"
171172
cmdArgs:= []string{
172173
"templates",
173174
"edit",
174175
template.Name,
176+
"--description",description,
175177
"--display-name",displayName,
176178
"--icon",icon,
177179
}
@@ -186,8 +188,8 @@ func TestTemplateEdit(t *testing.T) {
186188
// Assert that the template metadata changed.
187189
updated,err:=client.Template(context.Background(),template.ID)
188190
require.NoError(t,err)
189-
assert.Equal(t,template.Name,updated.Name)// doesn't change
190-
assert.Equal(t,initialDescription,updated.Description)// doesn't change
191+
assert.Equal(t,template.Name,updated.Name)// doesn't change
192+
assert.Equal(t,description,updated.Description)
191193
assert.Equal(t,displayName,updated.DisplayName)
192194
assert.Equal(t,icon,updated.Icon)
193195
})
@@ -234,9 +236,9 @@ func TestTemplateEdit(t *testing.T) {
234236
require.NoError(t,err)
235237
// Properties don't change
236238
assert.Equal(t,template.Name,updated.Name)
237-
assert.Equal(t,template.Description,updated.Description)
238239
// These properties are removed, as the API considers it as "delete" request
239240
// See: https://github.com/coder/coder/issues/5066
241+
assert.Equal(t,"",updated.Description)
240242
assert.Equal(t,"",updated.Icon)
241243
assert.Equal(t,"",updated.DisplayName)
242244
})

‎coderd/coderdtest/coderdtest.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,9 +591,8 @@ func CreateWorkspaceBuild(
591591
// compatibility with testing. The name assigned is randomly generated.
592592
funcCreateTemplate(t*testing.T,client*codersdk.Client,organization uuid.UUID,version uuid.UUID,mutators...func(*codersdk.CreateTemplateRequest)) codersdk.Template {
593593
req:= codersdk.CreateTemplateRequest{
594-
Name:randomUsername(t),
595-
Description:randomUsername(t),
596-
VersionID:version,
594+
Name:randomUsername(t),
595+
VersionID:version,
597596
}
598597
for_,mut:=rangemutators {
599598
mut(&req)

‎coderd/templates.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,8 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
493493
}
494494

495495
// Update template metadata -- empty fields are not overwritten,
496-
// except for display_name, icon, and default_ttl.
497-
//The exception is required to clear content of these fields with UI.
496+
// except for display_name,description,icon, and default_ttl.
497+
//These exceptions are required to clear content of these fields with UI.
498498
name:=req.Name
499499
displayName:=req.DisplayName
500500
desc:=req.Description
@@ -503,9 +503,6 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
503503
ifname=="" {
504504
name=template.Name
505505
}
506-
ifdesc=="" {
507-
desc=template.Description
508-
}
509506

510507
varerrerror
511508
updated,err=tx.UpdateTemplateMetaByID(ctx, database.UpdateTemplateMetaByIDParams{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp