runtime/command/new/controller: Fix links when generating controllers…

… and views. Closes: #82
livebud · May 23, 2022 · 63f64db · 63f64db
1 parent cf2a242
commit 63f64db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/runtime/command/new/controller/controller.go b/runtime/command/new/controller/controller.go
@@ -80,12 +80,13 @@ type Action struct {
 }
 
 type View struct {
-	template string
-	Path     string
-	Title    string
-	Variable string
-	Singular string
-	Plural   string
+	template   string
+	Controller *Controller
+	Path       string
+	Title      string
+	Variable   string
+	Singular   string
+	Plural     string
 }
 
 func (c *Command) Run(ctx context.Context) (err error) {
@@ -160,12 +161,13 @@ func (c *Command) view(controller *Controller, action *Action) *View {
 		template = defaultView
 	}
 	return &View{
-		template: template,
-		Path:     filepath.Join("view", controller.key, action.Name+".svelte"),
-		Title:    text.Title(controller.Struct),
-		Variable: text.Camel(action.Result),
-		Singular: text.Camel(text.Singular(action.Result)),
-		Plural:   text.Camel(text.Plural(action.Result)),
+		template:   template,
+		Controller: controller,
+		Path:       filepath.Join("view", controller.key, action.Name+".svelte"),
+		Title:      text.Title(controller.Struct),
+		Variable:   text.Camel(action.Result),
+		Singular:   text.Camel(text.Singular(action.Result)),
+		Plural:     text.Camel(text.Plural(action.Result)),
 	}
 }
 

diff --git a/runtime/command/new/controller/view/index.gotext b/runtime/command/new/controller/view/index.gotext
@@ -15,8 +15,8 @@
   {#each {{ $.Plural }} as {{ $.Singular -}} }
     <tr>
       {#each Object.keys({{ $.Singular }}) as key}
-        {#if key === "id"}
-          <td><a href={`/${ {{- $.Singular }}[key]}`}>{ {{- $.Singular }}[key]}</a></td>
+        {#if key.toLowerCase() === "id"}
+          <td><a href={`{{ $.Controller.Route }}/${ {{- $.Singular }}[key]}`}>{ {{- $.Singular }}[key]}</a></td>
         {:else}
           <td>{ {{- $.Singular }}[key]}</td>
         {/if}

diff --git a/runtime/command/new/controller/view/show.gotext b/runtime/command/new/controller/view/show.gotext
@@ -19,7 +19,7 @@
 
 <br />
 
-<a href="..">Back</a>
+<a href="{{ $.Controller.Route }}">Back</a>
 
 <style>
   table {
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
     <br />
-    <a href="..">Back</a>
+    <a href="{{ $.Controller.Route }}">Back</a>
     <style>
       table {
@@ Expand Down @@