From 36cca46b64bbb26ebd43ca7e59426aec776d6c5b Mon Sep 17 00:00:00 2001 From: yasushiito Date: Sun, 14 Sep 2014 10:51:50 +0900 Subject: [PATCH] add js form --- app/assets/javascripts/ap.js | 18 +++ app/assets/javascripts/locmare/form.js.coffee | 160 +++++++++++++++++++++ .../locmare/form/extend_field.js.coffee | 60 ++++++++ .../javascripts/locmare/form/field.js.coffee | 61 ++++++++ .../locmare/form/field/helper.js.coffee | 16 +++ .../locmare/form/field/helper/base.js.coffee | 7 + .../locmare/form/field/helper/color.js.coffee | 7 + .../locmare/form/field/helper/popup.js.coffee | 7 + .../locmare/form/field/helper/size.js.coffee | 6 + .../locmare/form/field/helper/tail_angle.js.coffee | 7 + .../javascripts/locmare/form/field/label.js.coffee | 14 ++ .../locmare/form/field/label/label.js.coffee | 51 +++++++ .../javascripts/locmare/form/field/tag.js.coffee | 17 +++ .../locmare/form/field/tag/base.js.coffee | 34 +++++ .../locmare/form/field/tag/hidden.js.coffee | 13 ++ .../locmare/form/field/tag/number.js.coffee | 13 ++ .../locmare/form/field/tag/select.js.coffee | 57 ++++++++ .../locmare/form/field/tag/text.js.coffee | 14 ++ .../locmare/form/field/tag/text_area.js.coffee | 18 +++ lib/locmare/form/field/tag/base.rb | 4 +- 20 files changed, 582 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/locmare/form.js.coffee create mode 100644 app/assets/javascripts/locmare/form/extend_field.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/helper.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/helper/base.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/helper/color.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/helper/popup.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/helper/size.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/label.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/label/label.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/tag.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/tag/base.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/tag/number.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/tag/select.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/tag/text.js.coffee create mode 100644 app/assets/javascripts/locmare/form/field/tag/text_area.js.coffee diff --git a/app/assets/javascripts/ap.js b/app/assets/javascripts/ap.js index b399adb1..90bed368 100644 --- a/app/assets/javascripts/ap.js +++ b/app/assets/javascripts/ap.js @@ -225,6 +225,24 @@ //= require ./locmare/profiler/association/belongs_to //= require ./locmare/profiler/association/has_many //= require ./locmare/profiler/association/has_one +//= require ./locmare/form +//= require ./locmare/form/field +//= require ./locmare/form/extend_field +//= require ./locmare/form/field/label +//= require ./locmare/form/field/label/label +//= require ./locmare/form/field/tag +//= require ./locmare/form/field/tag/base +//= require ./locmare/form/field/tag/text +//= require ./locmare/form/field/tag/number +//= require ./locmare/form/field/tag/text_area +//= require ./locmare/form/field/tag/select +//= require ./locmare/form/field/tag/hidden +//= require ./locmare/form/field/helper +//= require ./locmare/form/field/helper/base +//= require ./locmare/form/field/helper/size +//= require ./locmare/form/field/helper/tail_angle +//= require ./locmare/form/field/helper/color +//= require ./locmare/form/field/helper/popup //= require ./peta/peta //= require ./peta/item //= require ./peta/owner diff --git a/app/assets/javascripts/locmare/form.js.coffee b/app/assets/javascripts/locmare/form.js.coffee new file mode 100644 index 00000000..78f5dc97 --- /dev/null +++ b/app/assets/javascripts/locmare/form.js.coffee @@ -0,0 +1,160 @@ +# form_name_with_sub_form +# item: editing item +# mounted: true/false +# submit: string / 'submit' +# operators: +class Locmare.FormBase extends Backbone.View + tagName: 'div' + + initialize: (options) -> + @form_name_with_sub_form = options.form_name_with_sub_form + @item = options.item + @mounted = options.mounted + @submit = options.submit + @operators = options.operators + if /\./.test(form_name_with_sub_form) + @sub_form_names = form_name_with_sub_form.split('.') + @form_name = @sub_form_names.last + @root_form_name = @sub_form_names.shift + else + @sub_form_names = [] + @form_name = @form_name_with_sub_form + @root_form_name = @form_name + @manifest = LocalManifest.manifest().forms[@form_name] + @fields = {} + + fold_extend_settings: (params) -> + @item.my_class().fold_extend_settings params[@item.item_name()] + + sub_form_name: () -> + r = _.map @sub_form_names, (name) -> + '[' + name + '_attributes' + ']' + r.join() + + form_field_name: (field_name) -> + @root_form_name + @sub_form_name() + '[' + field_name + ']' + + image_dir: () -> + '/images/' + +class Locmare.Form extends Locmare.FormBase + initialize: (options) -> + super(options) + @submit = options.submit + @item.boosts 'post' + @init_fields() + + render: () -> + this.$el.html('') + @error_explanation = null + @div_fields = new Locmare.FormModule.Fields({ + fields: @fields + }) + #this.$el.append(@error_explanation.render().el) if not @error_explanation + this.$el.append(@div_fields.render().el) + if @submit + c = @submit_class() + @div_submit = new c({form: this}) + this.$el.append(@div_submit.render().el) + this + + init_fields: () -> + _this = this + _.each _this.manifest.field_names, (field_name) -> + field_manifest = _this.manifest.fields[field_name] + boost_name = _this.item.my_class().find_boost_name(field_name) + extend_model = if boost_name + _this.item.boosters[boost_name].extend_model() + else + null + if boost_name and extend_model # field is extend setting AND template has a extend model + extend_form_name = @item.boosters[boost_name].model_name + extend_item = @item.boosters[boost_name].extend_item + _this.fields[field_name] = new Locmare.ExtendForm({ + parent: _this, + form_name: extend_form_name, + item: extend_item, + mounted: _this.mounted, + operators: _this.operators, + field_name: field_name + }) + else + _this.fields[field_name] = new Locmare.FormModule.Field({ + form: _this, + field_name: field_name, + field_manifest: field_manifest + }) + + submit_name: () -> + if @item.isNew() + @item.table_name() + '.submit.new' + else + @item.table_name() + '.submit.edit' + + submits: () -> + { + default: Locmare.FormModule.SubmitModule.Default + } + + submit_class: () -> + @submits()[@submit] + +class Locmare.ExtendForm extends Locmare.FormBase + + initialize: (options) -> + @parent = options.parent + @form_name = options.form_name + @item = options.item + @mounted = options.mounted + @operators = options.operators + @field_name = options.field_name + super(@form_name, @item, @mounted, @operators) + @field = new Locmare.FormModule.Field({ + form: @parent, + field_name: @field_name, + field_manifest: @parent.manifest.fields[@field_name] + }) + @label = @field.label + @init_fields() + + init_fields: () -> + _this = this + _.each _this.manifest.field_names, (field_name) -> + field_manifest = _this.manifest.fields[field_name] + _this.fields[field_name] = new Locmare.FormModule.ExtendField({ + form: _this, + field_name: field_name, + field_manifest: field_manifest + }) + + form_field_name: (field_name) -> + # parent is field + @parent.form_field_name(field_name) + '[' + field_name + ']' + +class Locmare.FormModule +class Locmare.FormModule.Fields extends Backbone.View + tagName: 'div' + className: 'fields' + + initialize: (options) -> + @fields = options.fields + + render: () -> + this.$el.html('') + _this = this + _.each @fields, (field) -> + _this.$el.append(field.render().el) + this + +class Locmare.FormModule.SubmitModule +class Locmare.FormModule.SubmitModule.Default extends Backbone.View + tagName: 'div' + className: 'actions' + + initialize: (options) -> + @form = options.form + + render: () -> + this.$el.html('') + this + diff --git a/app/assets/javascripts/locmare/form/extend_field.js.coffee b/app/assets/javascripts/locmare/form/extend_field.js.coffee new file mode 100644 index 00000000..b8742baa --- /dev/null +++ b/app/assets/javascripts/locmare/form/extend_field.js.coffee @@ -0,0 +1,60 @@ +class Locmare.FormModule.ExtendField extends Backbone.View + tagName: 'div' + className: 'extend-field' + + initialize: (options) -> + @form = options.form + @field_name = options.field_name + @field_manifest = options.field_manifest + @label = Locmare.FormModule.FieldModule.LabelFactory.factory this, @field_manifest.label + @tag = Locmare.FormModule.FieldModule.TagFactory.factory this, @field_manifest.tag + @helpers = {} + _this = this + _.each @field_manifest.helpers, (helper_manifest, helper_name) -> + _this.helpers[helper_name] = Locmare.FormModule.FieldModule.HelperFactory.factory(_this, helper_manifest) + @rb = @row_break() + @options = {'data-model': @field_manifest.model_name} + + render: () -> + this.$el.html('') + this.$el.append(@label.render().el) if not @label.hidden() + this.$el.append(@tag.render().el) + _this = this + _.each @helpers, (helper) -> + _this.$el.append(helper.render().el) + this.$el.append(@rb.render().el) if @rb + this + + mounted: () -> + if @form.mounted + 0 + else + 1 + + mount_option: () -> + {'mount': @mounted()} + + item: () -> + @form.item + + value: () -> + @item().get(@field_manifest.column_name) + + options: (tag_options = {}) -> + tag_options + + form_field_name: () -> + @form.form_field_name @field_name + + form_name: () -> + @form.form_name + + row_break: () -> + if @field_manifest.row_break + new Pettanr.Tag.Div({ + content: null, + class_name: 'row_break' + }) + else + null + diff --git a/app/assets/javascripts/locmare/form/field.js.coffee b/app/assets/javascripts/locmare/form/field.js.coffee new file mode 100644 index 00000000..42d340b5 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field.js.coffee @@ -0,0 +1,61 @@ +class Locmare.FormModule.Field extends Backbone.View + tagName: 'div' + className: 'field' + + initialize: (options) -> + @form = options.form + @field_name = options.field_name + @field_manifest = options.field_manifest + @label = Locmare.FormModule.FieldModule.LabelFactory.factory this, @field_manifest.label + @tag = Locmare.FormModule.FieldModule.TagFactory.factory this, @field_manifest.tag + @helpers = {} + _this = this + _.each @field_manifest.helpers, (helper_manifest, helper_name) -> + _this.helpers[helper_name] = Locmare.FormModule.FieldModule.HelperFactory.factory(_this, helper_manifest) + @rb = @row_break() + @options = {'data-model': @field_manifest.form_name} + + render: () -> + this.$el.html('') + this.$el.append(@label.render().el) if not @label.hidden() + this.$el.append(@tag.render().el) + _this = this + _.each @helpers, (helper) -> + _this.$el.append(helper.render().el) + this.$el.append(@rb.render().el) if @rb + this + + mounted: () -> + if @form.mounted + 0 + else + 1 + + mount_option: () -> + {'mount': @mounted()} + + item: () -> + @form.item + + value: () -> + @item().get(@field_manifest.column_name) + + options: (tag_options = {}) -> + tag_options + + form_field_name: () -> + @form.form_field_name @field_name + + form_name: () -> + @form.form_name + + row_break: () -> + if @field_manifest.row_break + new Pettanr.Tag.Div({ + content: null, + class_name: 'row_break' + }) + else + null + +class Locmare.FormModule.FieldModule diff --git a/app/assets/javascripts/locmare/form/field/helper.js.coffee b/app/assets/javascripts/locmare/form/field/helper.js.coffee new file mode 100644 index 00000000..99ce8de2 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/helper.js.coffee @@ -0,0 +1,16 @@ +class Locmare.FormModule.FieldModule.HelperFactory + @types: () -> + { + size: Locmare.FormModule.FieldModule.HelperModule.Size, + tail_angle: Locmare.FormModule.FieldModule.HelperModule.TailAngle, + color: Locmare.FormModule.FieldModule.HelperModule.Color, + popup: Locmare.FormModule.FieldModule.HelperModule.Popup + } + + @factory: (field, my_manifest) -> + type = my_manifest.type + my_class = @types()[type] + console.log "undefined class for local view forms > #{field.form_name} > fields > #{field.field_name} > helper > #{type}\n" if not my_class + new my_class({field: field, my_manifest: my_manifest}) + +class Locmare.FormModule.FieldModule.HelperModule diff --git a/app/assets/javascripts/locmare/form/field/helper/base.js.coffee b/app/assets/javascripts/locmare/form/field/helper/base.js.coffee new file mode 100644 index 00000000..8266123b --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/helper/base.js.coffee @@ -0,0 +1,7 @@ +class Locmare.FormModule.FieldModule.HelperModule.Base extends Backbone.View + tagName: 'input' + + initialize: (options) -> + @field = options.field + @tag_manifest = options.tag_manifest + diff --git a/app/assets/javascripts/locmare/form/field/helper/color.js.coffee b/app/assets/javascripts/locmare/form/field/helper/color.js.coffee new file mode 100644 index 00000000..2b8e0f1f --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/helper/color.js.coffee @@ -0,0 +1,7 @@ +class Locmare.FormModule.FieldModule.HelperModule.Color extends Locmare.FormModule.FieldModule.HelperModule.Base + tagName: 'input' + + render: () -> + this.$el.html('') + this + diff --git a/app/assets/javascripts/locmare/form/field/helper/popup.js.coffee b/app/assets/javascripts/locmare/form/field/helper/popup.js.coffee new file mode 100644 index 00000000..0f3473f7 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/helper/popup.js.coffee @@ -0,0 +1,7 @@ +class Locmare.FormModule.FieldModule.HelperModule.Popup extends Locmare.FormModule.FieldModule.HelperModule.Base + tagName: 'textarea' + + render: () -> + this.$el.html('') + this + diff --git a/app/assets/javascripts/locmare/form/field/helper/size.js.coffee b/app/assets/javascripts/locmare/form/field/helper/size.js.coffee new file mode 100644 index 00000000..19ae6062 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/helper/size.js.coffee @@ -0,0 +1,6 @@ +class Locmare.FormModule.FieldModule.HelperModule.Size extends Locmare.FormModule.FieldModule.HelperModule.Base + + render: () -> + this.$el.html('') + this + diff --git a/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee b/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee new file mode 100644 index 00000000..25d280c6 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee @@ -0,0 +1,7 @@ +class Locmare.FormModule.FieldModule.HelperModule.TailAngle extends Locmare.FormModule.FieldModule.HelperModule.Base + tagName: 'select' + + render: () -> + this.$el.html('') + this + diff --git a/app/assets/javascripts/locmare/form/field/label.js.coffee b/app/assets/javascripts/locmare/form/field/label.js.coffee new file mode 100644 index 00000000..785db58e --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/label.js.coffee @@ -0,0 +1,14 @@ +class Locmare.FormModule.FieldModule.LabelFactory + @types: () -> + { + default: Locmare.FormModule.FieldModule.LabelModule.Default, + none: Locmare.FormModule.FieldModule.LabelModule.None + } + + @factory: (field, my_manifest) -> + type = my_manifest.type + my_class = @types()[type] + console.log "undefined class for local view forms > #{field.form_name} > fields > #{field.field_name} > label > #{type}\n" if not my_class + new my_class({field: field, my_manifest: my_manifest}) + +class Locmare.FormModule.FieldModule.LabelModule diff --git a/app/assets/javascripts/locmare/form/field/label/label.js.coffee b/app/assets/javascripts/locmare/form/field/label/label.js.coffee new file mode 100644 index 00000000..acee74f4 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/label/label.js.coffee @@ -0,0 +1,51 @@ +class Locmare.FormModule.FieldModule.LabelModule.Base extends Backbone.View + tagName: 'label' + + initialize: (options) -> + @field = options.field + @label_manifest = options.label_manifest + @rb = @row_break() + + form: () -> + @field.form + + manifest: () -> + @form().manifest + + form_name: () -> + @form().form_name + + item: () -> + @form().item + + item_name: () -> + @label_manifest.model_name() + + column_name: () -> + @label_manifest.column_name() + + hidden: () -> + false + + row_break: () -> + if @label_manifest.row_break + '
' + else + null + +class Locmare.FormModule.FieldModule.LabelModule.Default extends Locmare.FormModule.FieldModule.LabelModule.Base + + label_name: () -> + 'activerecord.attributes.' + @item_name() + '.' + @column_name() + + render: () -> + this.$el.html('') + this.$el.append(label_name()) + this.$el.append(@rb) if @rb + this + +class Locmare.FormModule.FieldModule.LabelModule.None extends Locmare.FormModule.FieldModule.LabelModule.Base + + hidden: () -> + true + diff --git a/app/assets/javascripts/locmare/form/field/tag.js.coffee b/app/assets/javascripts/locmare/form/field/tag.js.coffee new file mode 100644 index 00000000..49fbc576 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/tag.js.coffee @@ -0,0 +1,17 @@ +class Locmare.FormModule.FieldModule.TagFactory + @types: () -> + { + text: Locmare.FormModule.FieldModule.TagModule.TextTag, + number: Locmare.FormModule.FieldModule.TagModule.NumberTag, + text_area: Locmare.FormModule.FieldModule.TagModule.TextAreaTag, + select: Locmare.FormModule.FieldModule.TagModule.SelectTag, + hidden: Locmare.FormModule.FieldModule.TagModule.HiddenTag + } + + @factory: (field, my_manifest) -> + type = my_manifest.type + my_class = @types()[type] + console.log "undefined class for local view forms > #{field.form_name} > fields > #{field.field_name} > tag > #{type}\n" if not my_class + new my_class({field: field, my_manifest: my_manifest}) + +class Locmare.FormModule.FieldModule.TagModule diff --git a/app/assets/javascripts/locmare/form/field/tag/base.js.coffee b/app/assets/javascripts/locmare/form/field/tag/base.js.coffee new file mode 100644 index 00000000..4847cd31 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/tag/base.js.coffee @@ -0,0 +1,34 @@ +class Locmare.FormModule.FieldModule.TagModule.Base extends Backbone.View + tagName: 'input' + + initialize: (options) -> + @field = options.field + @tag_manifest = options.tag_manifest + + form_field_name: () -> + @field.form_field_name() + + value: () -> + @field.value() + + options: () -> + @tag_manifest.options + + form: () -> + @field.form + + manifest: () -> + @form().manifest + + form_name: () -> + @form().form_name + + item: () -> + @form().item + + model_name: () -> + @tag_manifest.model_name() + + column_name: () -> + @tag_manifest.column_name() + diff --git a/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee b/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee new file mode 100644 index 00000000..3f9bf964 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee @@ -0,0 +1,13 @@ +class Locmare.FormModule.FieldModule.TagModule.Hidden extends Locmare.FormModule.FieldModule.TagModule.Base + + render: () -> + this.$el.html('') + @attr = { + type: 'hidden', + name: @form_field_name(), + value: @value() + } + _.extend(@attr, @options()) + this.$el.attr(@attr) + this + diff --git a/app/assets/javascripts/locmare/form/field/tag/number.js.coffee b/app/assets/javascripts/locmare/form/field/tag/number.js.coffee new file mode 100644 index 00000000..1cb97e6a --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/tag/number.js.coffee @@ -0,0 +1,13 @@ +class Locmare.FormModule.FieldModule.TagModule.Number extends Locmare.FormModule.FieldModule.TagModule.Base + + render: () -> + this.$el.html('') + @attr = { + type: 'number', + name: @form_field_name(), + value: @value() + } + _.extend(@attr, @options()) + this.$el.attr(@attr) + this + diff --git a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee new file mode 100644 index 00000000..ecffc19e --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee @@ -0,0 +1,57 @@ +class Locmare.FormModule.FieldModule.TagModule.Select extends Locmare.FormModule.FieldModule.TagModule.Base + tagName: 'select' + + render: () -> + this.$el.html('') + @attr = { + name: @form_field_name(), + } + _.extend(@attr, @options()) + this.$el.attr(@attr) + _.each @select_values(), (member) -> + selected = if @is_selected(member) + ' selected' + else + '' + _this.$el.append('') + this + + model_manifest: () -> + Manifest.manifest().models[@field.field_manifest.model_name()] + + model_attribute_manifest: () -> + @model_manifest().get(@field.field_manifest.column_name()) + + select_item_name: () -> + @model_attribute_manifest().source.select_item_name + + items: () -> + if @model_attribute_manifest().source.type == 'model' + Manifest.manifest().system_resources.select_items[@select_item_name()] + else + resource_model_name = @model_attribute_manifest().source.resource_model_name + resource_list_name = @model_attribute_manifest().source.resource_list_name + filter_column_name = @model_attribute_manifest().source.filter_column_name + filter_id = @form().item().get(filter_column_name) + list = Locmare.ListGroup.list resource_model_name, resource_list_name + _.map list.items(null, {id: filter_id}), (i) -> + [i.caption, i.id] + + source_by_model: () -> + switch @model_attribute_manifest().source.type + when 'model', 'filter' + true + when 'magic_number' + false + else + null + + is_selected: (member) -> + @value() == member[1] + + select_values: () -> + if @source_by_model() + @items() + else + Pettanr.t_select_items(@items()) + diff --git a/app/assets/javascripts/locmare/form/field/tag/text.js.coffee b/app/assets/javascripts/locmare/form/field/tag/text.js.coffee new file mode 100644 index 00000000..06be50b2 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/tag/text.js.coffee @@ -0,0 +1,14 @@ +class Locmare.FormModule.FieldModule.TagModule.Text extends Locmare.FormModule.FieldModule.TagModule.Base + tagName: 'input' + + render: () -> + this.$el.html('') + @attr = { + type: 'text', + name: @form_field_name(), + value: @value() + } + _.extend(@attr, @options()) + this.$el.attr(@attr) + this + diff --git a/app/assets/javascripts/locmare/form/field/tag/text_area.js.coffee b/app/assets/javascripts/locmare/form/field/tag/text_area.js.coffee new file mode 100644 index 00000000..0ff07676 --- /dev/null +++ b/app/assets/javascripts/locmare/form/field/tag/text_area.js.coffee @@ -0,0 +1,18 @@ +class Locmare.FormModule.FieldModule.TagModule.TextArea extends Locmare.FormModule.FieldModule.TagModule.Base + tagName: 'textarea' + + render: () -> + this.$el.html('') + @attr = { + name: @form_field_name(), + } + if sz = @tag_manifest.options['size'] + r = sz.split('x') + @tag_manifest.options['cols'] = r[0] + @tag_manifest.options['rows'] = r[1] + delete @tag_manifest.options['size'] + _.extend(@attr, @options()) + this.$el.attr(@attr) + this.$el.html(@value()) + this + diff --git a/lib/locmare/form/field/tag/base.rb b/lib/locmare/form/field/tag/base.rb index 484608aa..a83f839a 100644 --- a/lib/locmare/form/field/tag/base.rb +++ b/lib/locmare/form/field/tag/base.rb @@ -43,11 +43,11 @@ module Locmare end def model_name - @label_manifest.model_name + @tag_manifest.model_name end def column_name - @label_manifest.column_name + @tag_manifest.column_name end def template_dir -- 2.11.0