BUG FIX: Fix add new link for fk

uadmin · Nov 27, 2018 · 585415d · 585415d
1 parent 706f55a
commit 585415d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/get_schema.go b/get_schema.go
@@ -148,6 +148,9 @@ func getSchema(a interface{}) (s ModelSchema, ok bool) {
 			f.DisplayName = val
 		}
 
+		// Get the type name
+		f.TypeName = t.Field(index).Type.Name()
+
 		// Process the field's data type
 		if t.Field(index).Type == SType {
 			f.Type = "string"
@@ -172,7 +175,8 @@ func getSchema(a interface{}) (s ModelSchema, ok bool) {
 			if val, ok := t.FieldByName(t.Field(index).Name + "ID"); ok {
 				// Check if the FK field is a number
 				if val.Type == NType || val.Type == NType1 || val.Type == NType2 || val.Type == NType3 || val.Type == NType4 || val.Type == NType5 {
-					//f.FK = val.Name
+					// Remove the pointer if it is a foreign key
+					f.TypeName = strings.Trim(f.TypeName, "*")
 				} else {
 					Trail(ERROR, "Invalid FK %s.%s your %sID field is not an integer based number", t.Name(), t.Field(index).Name, t.Field(index).Name)
 				}

diff --git a/global.go b/global.go
@@ -79,7 +79,7 @@ const cEMAIL = "email"
 const cM2M = "m2m"
 
 // Version number as per Semantic Versioning 2.0.0 (semver.org)
-const Version = "0.1.0-beta.4"
+const Version = "0.1.0-beta.5"
 
 // Public Global Variables
 

diff --git a/schema.go b/schema.go
@@ -35,6 +35,7 @@ type F struct {
 	Name              string
 	DisplayName       string
 	Type              string
+	TypeName          string
 	Value             interface{}
 	Help              string
 	Max               interface{}

diff --git a/templates/uadmin/default/form.html b/templates/uadmin/default/form.html
@@ -251,7 +251,7 @@
                                 <option value="{{ .K }}"{{if .Selected}} selected{{end}}>{{ .V }}</option>
                               {{end}}
                             </select>
-                            <a class="checkinventory camelcaseFixHrefID {{if $is_readonly}}hidden{{end}} no-style" href="{{$RootURL}}{{.Name}}ID">
+                            <a class="camelcaseFixHrefID {{if $is_readonly}}hidden{{end}} no-style" href="{{$RootURL}}{{.TypeName}}ID">
                                 <i class="fa fa-plus-circle"></i>&nbsp;add new
                              </a>
 														 {{ if eq .Help "" }}{{ else }}<br /><span class="text-muted" style="font-size:12px;"><i class="fa fa-question-circle"></i> {{.Help}}</span>{{ end }}