Skip to content

Commit dd63135

Browse files
authored
Merge pull request icebob#124 from CodyCodeman/fix-device-form
Fixed issue with Post and Device forms not rendering text type fields…
2 parents 13a230d + 43867f5 commit dd63135

File tree

4 files changed

+1749
-18
lines changed

4 files changed

+1749
-18
lines changed

client/app/modules/devices/schema.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module.exports = {
6767
form: {
6868
fields: [
6969
{
70-
type: "text",
70+
type: "input",
7171
label: _("ID"),
7272
model: "code",
7373
readonly: true,
@@ -89,9 +89,9 @@ module.exports = {
8989
default: "rasperry",
9090
validator: validators.required
9191

92-
},
92+
},
9393
{
94-
type: "text",
94+
type: "input",
9595
label: _("Name"),
9696
model: "name",
9797
featured: true,
@@ -100,15 +100,15 @@ module.exports = {
100100
validator: validators.string
101101
},
102102
{
103-
type: "text",
103+
type: "input",
104104
label: _("Description"),
105105
model: "description",
106106
featured: false,
107107
required: false,
108108
validator: validators.string
109-
},
109+
},
110110
{
111-
type: "text",
111+
type: "input",
112112
label: _("Address"),
113113
model: "address",
114114
placeholder: _("AddressOfDevice"),

client/app/modules/posts/index.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@
9797
schema: {
9898
fields: [
9999
{
100-
type: "text",
100+
type: "input",
101101
label: this._("Title"),
102102
model: "title",
103103
featured: true,
104104
required: true,
105105
placeholder: this._("TitleOfPost"),
106106
validator: validators.string
107-
},
107+
},
108108
{
109109
type: "textArea",
110110
label: this._("Content"),
@@ -163,11 +163,11 @@
163163
* @param {Object} res Post object
164164
*/
165165
removed(res) {
166-
this.removed(res.data);
166+
this.removed(res.data);
167167
toast.success(this._("PostNameDeleted", res), this._("PostDeleted"));
168168
}
169169
}
170-
},
170+
},
171171
172172
methods: {
173173
...mapActions("posts", [
@@ -195,7 +195,7 @@
195195
toggleVote(post) {
196196
if (this.iVoted(post))
197197
this.unVote(post);
198-
else
198+
else
199199
this.vote(post);
200200
},
201201
@@ -245,7 +245,7 @@
245245
if (el)
246246
el.focus();
247247
});
248-
},
248+
},
249249
250250
savePost() {
251251
if (this.$refs.form.validate()) {
@@ -364,9 +364,9 @@
364364
}
365365
}
366366
367-
.media-content {
367+
.media-content {
368368
overflow-x: auto;
369-
369+
370370
h3 {
371371
margin: 0 0 0.5em 0;
372372
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
"url-loader": "0.5.8",
166166
"uuid": "3.0.1",
167167
"vue": "2.5.17",
168-
"vue-form-generator": "2.2.2",
168+
"vue-form-generator": "2.1.1",
169169
"vue-html-loader": "1.2.4",
170170
"vue-loader": "15.4.1",
171171
"vue-router": "3.0.1",

0 commit comments

Comments
 (0)