engine2 1.0.5 → 1.0.6

data/views/fields/email.slim

@@ -1,12 +1,12 @@
 /.col-lg-8.col-md-10.col-sm-12
-div e2-input-cols="{{::info.render.length}}"
+div e2-input-cols="{{::field.render.length}}"
   .input-group.input-group-sm
     input [
       type="text"
       ng-model="action.record[f]"
-      maxlength="{{info.render.length}}"
+      maxlength="{{field.render.length}}"
       class="form-control"
-      ng-disabled="info.disabled"
+      ng-disabled="field.disabled"
       e2-field=""
     ]
     span.input-group-addon @

data/views/fields/file_store.slim

@@ -27,18 +27,18 @@ e2-action action="[f + '_file_store!']"
       .progress.progress-striped
         .progress-bar.progress-bar-success ng-style="{'width': action.progress + '%'}"
 
-      div ng-if="info.render.multiple"
+      div ng-if="field.render.multiple"
         input [
           type="file"
-          ng-disabled="info.disabled"
+          ng-disabled="field.disabled"
           ngf-select="action.select($files)"
           ngf-multiple="true"
         ]
 
-      div ng-if="!info.render.multiple"
+      div ng-if="!field.render.multiple"
         input [
           type="file"
-          ng-disabled="info.disabled"
+          ng-disabled="field.disabled"
           ngf-select="action.select($files)"
           ngf-multiple="false"
         ]

data/views/fields/input_text.slim

@@ -1,13 +1,13 @@
 /.col-lg-8.col-md-9.col-sm-12
-div e2-input-cols="{{::info.render.length}}"
+div e2-input-cols="{{::field.render.length}}"
   .input-group.input-group-sm
     input [
       type="text"
       ng-model="action.record[f]"
-      maxlength="{{::info.render.length}}"
-      ng-disabled="info.disabled"
+      maxlength="{{::field.render.length}}"
+      ng-disabled="field.disabled"
       class="form-control input-sm"
-      ng-class="::info.render.class"
+      ng-class="::field.render.class"
       e2-field=""
     ]
     span.input-group-addon: span.glyphicon.glyphicon-pencil

data/views/fields/integer.slim

@@ -3,7 +3,7 @@
     input [
       type="text"
       ng-model="action.record[f]"
-      ng-disabled="info.disabled"
+      ng-disabled="field.disabled"
       class="form-control"
       e2-field=""
       e2-integer=""

data/views/fields/list_bsmselect.slim

@@ -0,0 +1,20 @@
+/.col-lg-7.col-md-8.col-sm-12
+div e2-input-cols="{{::field.render.length}}"
+  button.btn.btn-default.btn-sm [
+    type="button"
+    ng-model="action.record[f]"
+    bs-options="v[0] as v[1] for v in field.render.values"
+    data-html="true"
+    ng-disabled="field.disabled"
+    ng-class="field.render.class"
+    class="form-control input-sm"
+
+    data-animation="{{::field.render.animation}}"
+    data-placeholder="..."
+    data-multiple="1"
+    data-max-length="{{::field.render.max_length}}"
+    data-max-length-html="{{::field.render.max_length_html}}"
+    bs-select=""
+
+    e2-field=""
+  ]

data/views/fields/list_bsselect.slim

@@ -1,15 +1,15 @@
 /.col-lg-7.col-md-8.col-sm-12
-div e2-input-cols="{{::info.render.length}}"
+div e2-input-cols="{{::field.render.length}}"
   button.btn.btn-default.btn-sm [
     type="button"
     ng-model="action.record[f]"
-    bs-options="v[0] as v[1] for v in info.render.list"
+    bs-options="v[0] as v[1] for v in field.render.values"
     data-html="true"
-    ng-disabled="info.disabled"
-    ng-class="info.render.class"
+    ng-disabled="field.disabled"
+    ng-class="field.render.class"
     class="form-control input-sm"
 
-    data-animation="{{::info.render.animation}}"
+    data-animation="{{::field.render.animation}}"
     data-placeholder="..."
     bs-select=""
 

data/views/fields/list_bsselect_opt.slim

@@ -1,20 +1,20 @@
 /.col-lg-7.col-md-8.col-sm-12
-div e2-input-cols="{{::info.render.length}}"
+div e2-input-cols="{{::field.render.length}}"
   .input-group.input-group-sm
     button.btn.btn-default [
       type="button"
       ng-model="action.record[f]"
-      bs-options="v[0] as v[1] for v in info.render.list"
+      bs-options="v[0] as v[1] for v in field.render.values"
       data-html="true"
-      ng-disabled="info.disabled"
-      ng-class="info.render.class"
+      ng-disabled="field.disabled"
+      ng-class="field.render.class"
       class="form-control input-sm"
       e2-field=""
 
-      data-animation="{{::info.render.animation}}"
+      data-animation="{{::field.render.animation}}"
       data-placeholder="..."
       bs-select=""
     ]
     .input-group-btn
-      a.btn.btn-default ng-disabled="info.disabled || action.record[f] == null" ng-click="action.record[f] = null"
+      a.btn.btn-default ng-disabled="field.disabled || action.record[f] == null" ng-click="action.record[f] = null"
         span.glyphicon.glyphicon-remove

data/views/fields/list_buttons.slim

@@ -1,3 +1,3 @@
 .col-lg-12
   .btn-group.btn-group-sm ng-model="action.record[f]" e2-field=""
-    a.btn.btn-default ng-class="action.record[f] == v[0] && 'active'" ng-click="action.record[f] = v[0]" ng-repeat="v in info.render.list" ng-bind-html="v[1]" ng-disabled="info.disabled"
+    a.btn.btn-default ng-class="action.record[f] == v[0] && 'active'" ng-click="action.record[f] = v[0]" ng-repeat="v in field.render.values" ng-bind-html="v[1]" ng-disabled="field.disabled"

data/views/fields/list_buttons_opt.slim

@@ -1,5 +1,5 @@
 .col-lg-12
   .btn-group.btn-group-sm ng-model="action.record[f]" e2-field=""
-    a.btn.btn-default ng-class="action.record[f] == v[0] && 'active'" ng-click="action.record[f] = v[0]" ng-repeat="v in info.render.list" ng-bind-html="v[1]" ng-disabled="info.disabled"
-    a.btn.btn-default ng-disabled="action.record[f] == null || info.disabled" ng-click="action.record[f] = null"
+    a.btn.btn-default ng-class="action.record[f] == v[0] && 'active'" ng-click="action.record[f] = v[0]" ng-repeat="v in field.render.values" ng-bind-html="v[1]" ng-disabled="field.disabled"
+    a.btn.btn-default ng-disabled="action.record[f] == null || field.disabled" ng-click="action.record[f] = null"
       span.glyphicon.glyphicon-remove

data/views/fields/list_select.slim

@@ -1,10 +1,10 @@
 /.col-lg-7.col-md-8.col-sm-12
-div e2-input-cols="{{::info.render.length}}"
+div e2-input-cols="{{::field.render.length}}"
   select.btn.btn-default.btn-sm [
     ng-model="action.record[f]"
-    ng-options="v[0] as v[1] for v in info.render.list"
-    ng-disabled="info.disabled"
-    ng-class="info.render.class"
+    ng-options="v[0] as v[1] for v in field.render.values"
+    ng-disabled="field.disabled"
+    ng-class="field.render.class"
     class="form-control input-sm"
     e2-field=""
   ]

data/views/fields/list_select_opt.slim

@@ -1,14 +1,14 @@
 /.col-lg-7.col-md-8.col-sm-12
-div e2-input-cols="{{::info.render.length}}"
+div e2-input-cols="{{::field.render.length}}"
   .input-group.input-group-sm
     select.btn.btn-default.btn-sm [
       ng-model="action.record[f]"
-      ng-options="v[0] as v[1] for v in info.render.list"
-      ng-disabled="info.disabled"
-      ng-class="info.render.class"
+      ng-options="v[0] as v[1] for v in field.render.values"
+      ng-disabled="field.disabled"
+      ng-class="field.render.class"
       class="form-control input-sm"
       e2-field=""
     ]
     .input-group-btn
-      a.btn.btn-default ng-disabled="info.disabled || action.record[f] == null" ng-click="action.record[f] = null"
+      a.btn.btn-default ng-disabled="field.disabled || action.record[f] == null" ng-click="action.record[f] = null"
         span.glyphicon.glyphicon-remove

data/views/fields/password.slim

@@ -1,13 +1,13 @@
 /.col-lg-8.col-md-9.col-sm-12
-div e2-input-cols="{{::info.render.length}}"
+div e2-input-cols="{{::field.render.length}}"
   .input-group.input-group-sm
     input [
       type="password"
       ng-model="action.record[f]"
-      maxlength="{{::info.render.length}}"
-      ng-disabled="info.disabled"
+      maxlength="{{::field.render.length}}"
+      ng-disabled="field.disabled"
       class="form-control input-sm"
-      ng-class="::info.render.class"
+      ng-class="::field.render.class"
       e2-field=""
     ]
     span.input-group-addon: span.glyphicon.glyphicon-asterisk

data/views/fields/radio_checkbox.slim

@@ -1,10 +1,10 @@
 .col-lg-3
   .btn-group.btn-group-sm [
-  	ng-init="action.record[f] = action.record[f] || info.render.false_value"
+  	ng-init="action.record[f] = action.record[f] || field.render.false_value"
     ng-model="action.record[f]"
     bs-buttons-radio=""
     e2-field=""
   ]
 
-    button.btn.btn-default type="button" value="{{::info.render.true_value}}": span.glyphicon.glyphicon-ok
-    button.btn.btn-default type="button" value="{{::info.render.false_value}}": span.glyphicon.glyphicon-remove
+    button.btn.btn-default type="button" value="{{::field.render.true_value}}": span.glyphicon.glyphicon-ok
+    button.btn.btn-default type="button" value="{{::field.render.false_value}}": span.glyphicon.glyphicon-remove

data/views/fields/scaffold.slim

@@ -1,2 +1,2 @@
 .col-lg-10.col-md-10.col-sm-10
-  e2-action action="info.assoc"
+  e2-action action="field.assoc"

data/views/fields/scaffold_picker.slim

@@ -1,16 +1,16 @@
-e2-action action="[info.assoc, 'decode']"
+e2-action action="[field.assoc, 'decode']"
   .col-lg-6.col-md-6.col-sm-8
     .input-group.input-group-sm
       a.btn.btn-default [
-        ng-disabled="info.disabled"
+        ng-disabled="field.disabled"
         class="form-control"
-        ng-click="!info.disabled && action.open()"
+        ng-click="!field.disabled && action.open()"
       ]
         span ng-bind-html="action.decode"
 
       .input-group-btn
-        a.btn.btn-default ng-disabled="info.disabled" ng-click="!info.disabled && action.open()": span.glyphicon.glyphicon-list
-        a.btn.btn-default ng-disabled="info.disabled || action.decode == null" ng-click="!info.disabled && action.reset()": span.glyphicon.glyphicon-remove
+        a.btn.btn-default ng-disabled="field.disabled" ng-click="!field.disabled && action.open()": span.glyphicon.glyphicon-list
+        a.btn.btn-default ng-disabled="field.disabled || action.decode == null" ng-click="!field.disabled && action.reset()": span.glyphicon.glyphicon-remove
 
     input [
       type="hidden"

data/views/fields/select_picker.slim

@@ -1,11 +1,11 @@
-e2-action action="[info.assoc, 'list']"
+e2-action action="[field.assoc, 'list']"
   .col-lg-7.col-md-8.col-sm-12
     select.btn.btn-default.btn-sm [
       ng-model="action.selected"
       ng-options="v.id as v.value for v in action.values"
       ng-change="action.change()"
-      ng-disabled="info.disabled"
-      ng-class="info.render.class"
+      ng-disabled="field.disabled"
+      ng-class="field.render.class"
       class="form-control input-sm"
       e2-field=""
     ]

data/views/fields/select_picker_opt.slim

@@ -1,15 +1,15 @@
-e2-action action="[info.assoc, 'list']"
+e2-action action="[field.assoc, 'list']"
   .col-lg-7.col-md-12.col-sm-12
     .input-group.input-group-sm
       select.btn.btn-default.btn-sm [
         ng-model="action.selected"
         ng-options="v.id as v.value for v in action.values"
         ng-change="action.change()"
-        ng-disabled="info.disabled"
-        ng-class="info.render.class"
+        ng-disabled="field.disabled"
+        ng-class="field.render.class"
         class="form-control"
         e2-field=""
       ]
       .input-group-btn
-        a.btn.btn-default ng-disabled="info.disabled || !action.selected" ng-click="action.reset()"
+        a.btn.btn-default ng-disabled="field.disabled || !action.selected" ng-click="action.reset()"
           span.glyphicon.glyphicon-remove

data/views/fields/text_area.slim

@@ -2,9 +2,9 @@
   textarea [
     spellcheck="false"
     ng-model="action.record[f]"
-    cols="{{info.render.cols}}"
-    rows="{{info.render.rows}}"
-    ng-disabled="info.disabled"
+    cols="{{field.render.cols}}"
+    rows="{{field.render.rows}}"
+    ng-disabled="field.disabled"
     class="form-control"
     e2-field=""
   ]

data/views/fields/time.slim

@@ -4,15 +4,16 @@
       type="text"
       class="form-control"
       ng-model="value"
-      ng-disabled="info.disabled"
+      ng-disabled="field.disabled"
 
-      data-time-format="{{::info.render.format}}"
-      data-animation="{{::info.render.animation}}"
+      data-time-format="{{::field.render.format}}"
+      data-animation="{{::field.render.animation}}"
       bs-timepicker=""
       e2-datepicker=""
-      e2-model-format="{{::info.render.model_format}}"
+      e2-model-format="{{::field.render.model_format}}"
       data-autoclose="1"
       data-arrow-behavior="picker"
+      data-time-type="{{::field.render.type}}"
 
       e2-force-view-value=""
       e2-field=""

data/views/fields/typeahead_picker.slim

@@ -1,4 +1,4 @@
-e2-action action="[info.assoc, 'typeahead']"
+e2-action action="[field.assoc, 'typeahead']"
   .col-lg-7.col-md-8.col-sm-12
     .input-group.input-group-sm
       input.btn.btn-default [
@@ -7,11 +7,11 @@ e2-action action="[info.assoc, 'typeahead']"
         bs-options="v.value for v in action.load($viewValue)"
         ng-keypress="action.key_pressed = true"
 
-        ng-disabled="info.disabled"
-        ng-class="info.render.class"
+        ng-disabled="field.disabled"
+        ng-class="field.render.class"
         class="form-control"
 
-        data-animation="{{::info.render.animation}}"
+        data-animation="{{::field.render.animation}}"
         placeholder="..."
         data-html="true"
         data-limit="10"
@@ -20,5 +20,5 @@ e2-action action="[info.assoc, 'typeahead']"
       ]
       span.input-group-addon: span.glyphicon.glyphicon-font
       .input-group-btn
-        a.btn.btn-default ng-disabled="info.disabled || action.decode == null" ng-click="!info.disabled && action.reset()"
+        a.btn.btn-default ng-disabled="field.disabled || action.decode == null" ng-click="!field.disabled && action.reset()"
           span.glyphicon.glyphicon-off

data/views/scaffold/fields.slim

@@ -1,10 +1,10 @@
 div
-  .form-group ng-class="action.errors[f] && 'has-error'" ng-repeat="f in form_field_list track by $index" ng-if="!action.meta.info[f].hidden" ng-init="info = action.meta.info[f]"
-    label.control-label ng-class="info.render.label_width || 'col-sm-3 col-md-3 col-lg-3'" for="{{f}}" ng-bind="::info.loc"
+  .form-group ng-class="action.errors[f] && 'has-error'" ng-repeat="f in form_field_list track by $index" ng-if="!action.meta.fields[f].hidden" ng-init="field = action.meta.fields[f]"
+    label.control-label ng-class="field.render.label_width || 'col-sm-3 col-md-3 col-lg-3'" for="{{f}}" ng-bind="::field.loc"
     .col-sm-9.col-md-9.col-lg-9
       .row
-        e2-include template="info.render.template"
+        e2-include template="field.render.template"
       .row
         .col-sm-12
           small.text-danger ng-repeat="e in action.errors[f] track by $index" ng-bind="e"
-      div ng-if="info.hr": hr
+      div ng-if="field.hr": hr

data/views/scaffold/form.slim

@@ -1,5 +1,5 @@
 form.form-horizontal role="form"
-  span ng-init="form_field_list = action.meta.fields" ng-if="true"
+  span ng-init="form_field_list = action.meta.field_list" ng-if="true"
     e2-include template="action.meta.panel.field_template"
 
   span ng-if="action.alert": .alert.alert-danger[] {{action.alert}}

data/views/scaffold/form_collapse.slim

@@ -8,11 +8,12 @@ form.form-horizontal role="form"
           ng-init="action.activeTab = [0]"
           ng-model="action.activeTab"
         ]
-        div.panel.panel-default ng-repeat="t in ::action.meta.tabs track by $index"
+        div ng-init="tabs = action.meta.tabs"
+        div.panel.panel-default ng-repeat="t in ::action.meta.tab_list track by $index" ng-if="!tabs[t].hidden"
           div.panel-heading role="tab"
             h4.panel-title
-              a bs-collapse-toggle="" ng-click="" ng-bind="::t.loc"
-          div.panel-collapse role="tabpanel" bs-collapse-target="" ng-init="form_field_list = t.fields"
+              a bs-collapse-toggle="" ng-click="" ng-bind="::tabs[t].loc"
+          div.panel-collapse role="tabpanel" bs-collapse-target="" ng-init="form_field_list = tabs[t].field_list"
             div.panel-body
               e2-include template="action.meta.panel.field_template"
 

data/views/scaffold/form_tabs.slim

@@ -1,8 +1,9 @@
 form.form-horizontal role="form"
   span ng-if="true"
     div bs-tabs="" bs-active-pane="action.activeTab" ng-init="action.activeTab = 0"
-      div ng-repeat="t in ::action.meta.tabs track by $index" title="{{::t.loc}}" bs-pane=""
-        div ng-if="!t.lazy || $index == action.activeTab" ng-init="form_field_list = t.fields"
+      div ng-init="tabs = action.meta.tabs"
+      div ng-repeat="t in ::action.meta.tab_list track by $index" title="{{::tabs[t].loc}}" bs-pane="" disabled="{{tabs[t].disabled}}" ng-if="!tabs[t].hidden"
+        div ng-if="!tabs[t].lazy || $index == action.activeTab" ng-init="form_field_list = tabs[t].field_list"
           br
           e2-include template="action.meta.panel.field_template"
 

data/views/scaffold/search.slim

@@ -1,8 +1,8 @@
 .panel.panel-default
   .panel-body
     form
-      span ng-repeat="f in action.meta.search_fields track by $index" ng-if="!action.meta.info[f].hidden_search" ng-init="info = action.meta.info[f]"
-        e2-include template="info.render.template"
+      span ng-repeat="f in action.meta.search_field_list track by $index" ng-if="!action.meta.fields[f].hidden_search" ng-init="field = action.meta.fields[f]"
+        e2-include template="field.render.template"
 
       .btn-group.btn-group-sm.pull-right
         button.btn.btn-default ng-click="action.load_new()"

data/views/scaffold/search_collapse.slim

@@ -9,14 +9,15 @@
           ng-init="action.ui_state.search_tab = (action.ui_state.search_tab + 0) <= 0 ? [0] : action.ui_state.search_tab"
           ng-model="action.ui_state.search_tab"
         ]
-        div.panel.panel-default ng-repeat="t in ::action.meta.tabs track by $index"
+        div ng-init="tabs = action.meta.tabs"
+        div.panel.panel-default ng-repeat="t in ::action.meta.tab_list track by $index"
           div.panel-heading role="tab"
             h4.panel-title
-              a bs-collapse-toggle="" ng-click="" ng-bind="::t.loc"
-          div.panel-collapse role="tabpanel" bs-collapse-target="" ng-init="form_field_list = t.fields"
+              a bs-collapse-toggle="" ng-click="" ng-bind="::tabs[t].loc"
+          div.panel-collapse role="tabpanel" bs-collapse-target="" ng-init="form_field_list = tabs[t].field_list"
             div.panel-body
-              span ng-repeat="f in t.fields track by $index" ng-if="!action.meta.info[f].hidden_search" ng-init="info = action.meta.info[f]"
-                e2-include template="info.render.template"
+              span ng-repeat="f in form_field_list track by $index" ng-if="!action.meta.fields[f].hidden_search" ng-init="field = action.meta.fields[f]"
+                e2-include template="field.render.template"
 
       .btn-group.btn-group-sm.pull-right
         button.btn.btn-default ng-click="action.load_new()"

data/views/scaffold/search_tabs.slim

@@ -2,10 +2,11 @@
   .panel-body
     form
       div bs-tabs="" ng-init="action.ui_state.search_tab = (action.ui_state.search_tab + 0) <= 0 ? 0 : action.ui_state.search_tab" bs-active-pane="action.ui_state.search_tab"
-        div ng-repeat="t in ::action.meta.tabs track by $index" title="{{::t.loc}}" bs-pane=""
+        div ng-init="tabs = action.meta.tabs"
+        div ng-repeat="t in ::action.meta.tab_list track by $index" title="{{::tabs[t].loc}}" bs-pane=""
           br
-          span ng-repeat="f in t.fields track by $index" ng-if="!action.meta.info[f].hidden_search" ng-init="info = action.meta.info[f]"
-            e2-include template="info.render.template"
+          span ng-repeat="f in tabs[t].field_list track by $index" ng-if="!action.meta.fields[f].hidden_search" ng-init="field = action.meta.fields[f]"
+            e2-include template="field.render.template"
 
       .btn-group.btn-group-sm.pull-right
         button.btn.btn-default ng-click="action.load_new()"