create models from adminifier. closes #109

Author: cooper

adminifier/wiki.go

@@ -42,6 +42,7 @@ var wikiFuncHandlers = map[string]func(*wikiRequest){
 	"image/":         handleImage,
 	"page-revisions": handlePageRevisions,
 	"create-page":    handleCreatePage,
+	"create-model":   handleCreateModel,
 }
 
 // wikiTemplate members are available to all wiki templates
@@ -684,19 +685,31 @@ func handlePageRevisions(wr *wikiRequest) {
 }
 
 func handleCreatePage(wr *wikiRequest) {
+	handleCreate("page", wr, func(dir, title string) (string, error) {
+		return wr.wi.CreatePage(dir, title, nil, getCommitOpts(wr, "Create page: "+title))
+	})
+}
+
+func handleCreateModel(wr *wikiRequest) {
+	handleCreate("model", wr, func(dir, title string) (string, error) {
+		return wr.wi.CreateModel(title, nil, getCommitOpts(wr, "Create model: "+title))
+	})
+}
+
+func handleCreate(typ string, wr *wikiRequest, createFunc func(dir, title string) (string, error)) {
 	if !parsePost(wr.w, wr.r, "title") {
 		return
 	}
 
 	title, dir := wr.r.Form.Get("title"), wr.r.Form.Get("dir")
 	var filename string
-	filename, wr.err = wr.wi.CreatePage(dir, title, nil, getCommitOpts(wr, "Create page: "+title))
+	filename, wr.err = createFunc(dir, title)
 	if wr.err != nil {
 		return
 	}
 
 	// redirect to edit page
-	http.Redirect(wr.w, wr.r, wr.wikiRoot+"edit-page?page="+path.Join(dir, filename), http.StatusTemporaryRedirect)
+	http.Redirect(wr.w, wr.r, wr.wikiRoot+"edit-"+typ+"?page="+path.Join(dir, filename), http.StatusTemporaryRedirect)
 }
 
 // possibly switch wiki branches

resources/adminifier/static/script/file-list/models.js

@@ -25,4 +25,17 @@ a.json.results.each(function (modelData) {
 
 modelList.draw($('content'));
 
+exports.createModel = function () {
+    var modal = new ModalWindow({
+        icon:           'plus-circle',
+        title:          'New Model',
+        html:           tmpl('tmpl-create-model', {}),
+        padded:         true,
+        id:             'create-model-window',
+        autoDestroy:    true,
+        onDone:         null
+    });
+    modal.show();
+}
+
 })(adminifier, window);

resources/adminifier/template/frame-models.tpl

@@ -12,7 +12,7 @@
     data-sort="{{.Order}}"
 
     data-buttons="create filter"
-    data-button-create="{'title': 'New Model', 'icon': 'plus-circle', 'href': '{{.Root}}/create-model'}"
+    data-button-create="{'title': 'New Model', 'icon': 'plus-circle', 'func': 'createModel'}"
     data-button-filter="{'title': 'Filter', 'icon': 'filter', 'func': 'displayFilter'}"
 
     data-selection-buttons="move rename delete"
@@ -21,4 +21,12 @@
     data-button-delete="{'title': 'Delete', 'icon': 'trash', 'func': 'deleteSelected', 'hide': true}"
 />
 
-{{ template "common-file-list.tpl" . }}
+{{ template "common-file-list.tpl" . }}
+
+<template id="tmpl-create-model">
+    <form action="func/create-model" method="post">
+        <label for="name">Model Name:</label>
+        <input type="text" name="title" />
+        <input type="submit" value="Create" />
+    </form>
+</template>

wiki/revision.go

@@ -497,6 +497,12 @@ func (w *Wiki) CreatePage(where string, title string, content []byte, commit Com
 	return name, w.WritePage(where+name, content, true, commit)
 }
 
+// CreateModel creates a new model file.
+func (w *Wiki) CreateModel(title string, content []byte, commit CommitOpts) (string, error) {
+	name := wikifier.ModelName(title)
+	return name, w.WriteModel(name, content, true, commit)
+}
+
 // RevisionInfo contains information about a specific revision.
 type RevisionInfo struct {
 	Id      string    `json:"id"`