engine2 1.0.5 → 1.0.6

data/views/scaffold/view.slim

@@ -1,7 +1,7 @@
 div
   table.table.table-striped.table-condensed.table-hover
-    tr ng-repeat="f in action.meta.fields track by $index" ng-hide="::action.meta.info[f].hidden"
-        td ng-bind="::action.meta.info[f].loc"
+    tr ng-repeat="f in action.meta.field_list track by $index" ng-hide="::action.meta.fields[f].hidden"
+        td ng-bind="::action.meta.fields[f].loc"
         td
           div ng-bind-html="action.view_cell(action.record, f)"
 

data/views/scaffold/view_collapse.slim

@@ -7,15 +7,16 @@ div
       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"
       div.panel-heading role="tab"
         h4.panel-title
-          a bs-collapse-toggle="" ng-click="" ng-bind="::t.loc"
+          a bs-collapse-toggle="" ng-click="" ng-bind="::tabs[t].loc"
       div.panel-collapse role="tabpanel" bs-collapse-target=""
         div.panel-body
           table.table.table-striped.table-condensed.table-hover
-            tr ng-repeat="f in t.fields" ng-hide="::action.meta.info[f].hidden"
-              td ng-bind="::action.meta.info[f].loc"
+            tr ng-repeat="f in tabs[t].field_list" ng-hide="::action.meta.fields[f].hidden"
+              td ng-bind="::action.meta.fields[f].loc"
               td
                 div ng-bind-html="action.view_cell(action.record, f)"
 

data/views/scaffold/view_tabs.slim

@@ -1,10 +1,11 @@
 div
   div bs-tabs="" bs-active-pane="action.activeTab" ng-init="action.activeTab = 0"
-    div ng-repeat="t in ::action.meta.tabs" title="{{::t.loc}}" bs-pane=""
+    div ng-init="tabs = action.meta.tabs"
+    div ng-repeat="t in ::action.meta.tab_list" title="{{::tabs[t].loc}}" bs-pane=""
       br
       table.table.table-striped.table-condensed.table-hover
-        tr ng-repeat="f in t.fields" ng-hide="::action.meta.info[f].hidden"
-          td ng-bind="::action.meta.info[f].loc"
+        tr ng-repeat="f in tabs[t].field_list" ng-hide="::action.meta.fields[f].hidden"
+          td ng-bind="::action.meta.fields[f].loc"
           td
             div ng-bind-html="action.view_cell(action.record, f)"
 

data/views/search_fields/bsmselect_picker.slim

@@ -1,4 +1,4 @@
-e2-action action="[info.assoc, 'list']"
+e2-action action="[field.assoc, 'list']"
   .col-lg-3.col-md-4.col-sm-5
     .form-group
       .input-group.input-group-sm
@@ -7,11 +7,11 @@ e2-action action="[info.assoc, 'list']"
           ng-model="action.selected"
           bs-options="v.id as v.value for v in action.values"
           ng-change="action.change()"
-          ng-class="info.render.class"
+          ng-class="field.render.class"
           class="form-control"
 
-          data-animation="{{::info.render.animation}}"
-          data-placeholder="{{::info.loc}}"
+          data-animation="{{::field.render.animation}}"
+          data-placeholder="{{::field.loc}}"
           data-multiple="1"
           data-max-length="3"
           data-max-length-html="wybranych"

data/views/search_fields/bsselect_picker.slim

@@ -1,4 +1,4 @@
-e2-action action="[info.assoc, 'list']"
+e2-action action="[field.assoc, 'list']"
   .col-lg-3.col-md-4.col-sm-5
     .form-group
       .input-group.input-group-sm
@@ -7,11 +7,11 @@ e2-action action="[info.assoc, 'list']"
           ng-model="action.selected"
           bs-options="v.id as v.value for v in action.values"
           ng-change="action.change()"
-          ng-class="info.render.class"
+          ng-class="field.render.class"
           class="form-control"
 
-          data-animation="{{::info.render.animation}}"
-          data-placeholder="{{::info.loc}}"
+          data-animation="{{::field.render.animation}}"
+          data-placeholder="{{::field.loc}}"
           data-html="true"
           bs-select=""
 

data/views/search_fields/checkbox.slim

@@ -1,11 +1,11 @@
 input [
   type="checkbox"
   ng-model="action.query.search[f]"
-  ng-true-value="{{::info.render.true_value}}"
-  ng-false-value="{{::info.render.false_value}}"
+  ng-true-value="{{::field.render.true_value}}"
+  ng-false-value="{{::field.render.false_value}}"
 
   xe2-search-field=""
 ]
 
-/ ng-false-value="{{info.render.false_value}}"
+/ ng-false-value="{{field.render.false_value}}"
 / ng-init="action.record[f] = '0'"

data/views/search_fields/checkbox2.slim

@@ -4,11 +4,11 @@
     bs-buttons-radio=""
     ng-change="action.search_field_change(f)"
   ]
-    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
     button.btn.btn-default type="button" ng-disabled="!action.query.search[f]": span.glyphicon.glyphicon-off
-  span ng-bind="::info.loc"
+  span ng-bind="::field.loc"
 
-/input type="checkbox" id="{{f}}" ng-model="action.query.search[f]" ng-true-value="{{info.render.true_value}}" ng-false-value="{{info.render.false_value}}"
-/ ng-false-value="{{info.render.false_value}}"
+/input type="checkbox" id="{{f}}" ng-model="action.query.search[f]" ng-true-value="{{field.render.true_value}}" ng-false-value="{{field.render.false_value}}"
+/ ng-false-value="{{field.render.false_value}}"
 / ng-init="action.record[f] = '0'"

data/views/search_fields/checkbox_buttons.slim

@@ -1,10 +1,10 @@
 .col-lg-3.col-md-3.col-sm-3
   .form-group
     .btn-group.btn-group-sm xe2-search-field=""
-      a.btn.btn-default ng-class="action.query.search[f] == info.render.true_value && 'active'" ng-click="action.query.search[f] = info.render.true_value; action.search_field_change(f)"
+      a.btn.btn-default ng-class="action.query.search[f] == field.render.true_value && 'active'" ng-click="action.query.search[f] = field.render.true_value; action.search_field_change(f)"
         span.glyphicon.glyphicon-ok
-      a.btn.btn-default ng-class="action.query.search[f] == info.render.false_value && 'active'" ng-click="action.query.search[f] = info.render.false_value; action.search_field_change(f)"
+      a.btn.btn-default ng-class="action.query.search[f] == field.render.false_value && 'active'" ng-click="action.query.search[f] = field.render.false_value; action.search_field_change(f)"
         span.glyphicon.glyphicon-remove
       a.btn.btn-default ng-disabled="action.query.search[f] == null" ng-click="action.query.search[f] = null; action.search_field_change(f)"
-        span ng-bind="::info.loc"
+        span ng-bind="::field.loc"
         span.glyphicon.glyphicon-off<

data/views/search_fields/date_range.slim

@@ -5,15 +5,15 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}; value = val
         input.btn.btn-default [
           type="text"
           class="form-control"
-          placeholder="{{::info.loc}} <"
+          placeholder="{{::field.loc}} <"
           ng-model="value.from"
           xng-change="action.search_field_change(f)"
           data-max-date="{{value.to}}"
-          data-date-format="{{::info.render.format}}"
-          data-animation="{{::info.render.animation}}"
+          data-date-format="{{::field.render.format}}"
+          data-animation="{{::field.render.animation}}"
           bs-datepicker=""
           e2-datepicker="from"
-          e2-model-format="{{::info.render.model_format}}"
+          e2-model-format="{{::field.render.model_format}}"
           data-autoclose="1"
           e2-search-field=""
         ]
@@ -27,15 +27,15 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}; value = val
         input.btn.btn-default [
           type="text"
           class="form-control"
-          placeholder="{{::info.loc}} >"
+          placeholder="{{::field.loc}} >"
           ng-model="value.to"
           xng-change="action.search_field_change(f)"
           data-min-date="{{value.from}}"
-          data-date-format="{{::info.render.format}}"
-          data-animation="{{::info.render.animation}}"
+          data-date-format="{{::field.render.format}}"
+          data-animation="{{::field.render.animation}}"
           bs-datepicker=""
           e2-datepicker="to"
-          e2-model-format="{{::info.render.model_format}}"
+          e2-model-format="{{::field.render.model_format}}"
           data-autoclose="1"
           e2-search-field=""
         ]

data/views/search_fields/decimal_date_range.slim

@@ -5,13 +5,13 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}"
         input.btn.btn-default [
           type="text"
           class="form-control"
-          placeholder="{{::info.loc}} <"
+          placeholder="{{::field.loc}} <"
           xng-model="value"
           ng-model="action.query.search[f].from"
           ng-change="action.search_field_change(f)"
           xe2-decimal-date-picker="" range="from"
           data-max-date="{{action.query.search[f].to}}"
-          data-date-format="{{::info.render.format}}"
+          data-date-format="{{::field.render.format}}"
           data-model-date-format="yyyyMMdd"
           bs-datepicker=""
           data-autoclose="1"
@@ -28,15 +28,15 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}"
         input.btn.btn-default [
           type="text"
           class="form-control"
-          placeholder="{{::info.loc}} >"
+          placeholder="{{::field.loc}} >"
           xng-model="value"
           ng-model="action.query.search[f].to"
           ng-change="action.search_field_change(f)"
           xe2-decimal-date-picker="" range="to"
           data-min-date="{{action.query.search[f].from}}"
-          data-date-format="{{::info.render.format}}"
+          data-date-format="{{::field.render.format}}"
           data-model-date-format="yyyyMMdd"
-          data-animation="{{::info.render.animation}}"
+          data-animation="{{::field.render.animation}}"
           bs-datepicker=""
           data-autoclose="1"
           data-date-type="string"

data/views/search_fields/input_text.slim

@@ -7,9 +7,9 @@
         ng-model-options="{debounce: 200}"
         maxlength="15"
         ng-change="action.search_field_change(f)"
-        ng-class="info.render.class"
+        ng-class="field.render.class"
         class="form-control"
-        placeholder="{{::info.loc}}"
+        placeholder="{{::field.loc}}"
         e2-search-field=""
       ]
       .input-group-btn

data/views/search_fields/integer.slim

@@ -7,7 +7,7 @@
         ng-model-options="{debounce: 200}"
         ng-change="action.search_field_change(f)"
         class="form-control"
-        placeholder="{{::info.loc}}"
+        placeholder="{{::field.loc}}"
         e2-search-field=""
         e2-integer=""
       ]

data/views/search_fields/integer_range.slim

@@ -6,7 +6,7 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}"
           type="text"
           ng-model="action.query.search[f].from"
           class="form-control"
-          placeholder="{{::info.loc}} <"
+          placeholder="{{::field.loc}} <"
           e2-search-field=""
           e2-integer=""
         ]
@@ -19,7 +19,7 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}"
           type="text"
           ng-model="action.query.search[f].to"
           class="form-control"
-          placeholder="{{::info.loc}} >"
+          placeholder="{{::field.loc}} >"
           e2-search-field=""
           e2-integer=""
         ]

data/views/search_fields/list_bsmselect.slim

@@ -5,14 +5,14 @@
         type="button"
         ng-init="action.query.search[f] = action.query.search[f] || []"
         ng-model="action.query.search[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-change="action.search_field_change(f)"
-        ng-class="info.render.class"
+        ng-class="field.render.class"
         class="form-control"
 
-        data-animation="{{::info.render.animation}}"
-        data-placeholder="{{::info.loc}}"
+        data-animation="{{::field.render.animation}}"
+        data-placeholder="{{::field.loc}}"
         data-multiple="1"
         data-max-length-html="wybranych"
         bs-select=""

data/views/search_fields/list_bsselect.slim

@@ -4,14 +4,14 @@
       button.btn.btn-default [
         type="button"
         ng-model="action.query.search[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-change="action.search_field_change(f)"
-        ng-class="info.render.class"
+        ng-class="field.render.class"
         class="form-control"
 
-        data-animation="{{::info.render.animation}}"
-        data-placeholder="{{::info.loc}}"
+        data-animation="{{::field.render.animation}}"
+        data-placeholder="{{::field.loc}}"
         bs-select=""
         e2-search-field=""
       ]

data/views/search_fields/list_buttons.slim

@@ -2,7 +2,7 @@
   /.container
   .form-group
     .btn-group.btn-group-sm ng-model="action.query.search[f]" e2-search-field=""
-      a.btn.btn-default ng-class="action.query.search[f] == v[0] && 'active'" ng-click="action.query.search[f] = v[0]; action.search_field_change(f)" ng-repeat="v in info.render.list" ng-bind-html="v[1]"
+      a.btn.btn-default ng-class="action.query.search[f] == v[0] && 'active'" ng-click="action.query.search[f] = v[0]; action.search_field_change(f)" ng-repeat="v in field.render.values" ng-bind-html="v[1]"
       a.btn.btn-default ng-disabled="action.query.search[f] == null" ng-click="action.query.search[f] = null; action.search_field_change(f)"
-        span ng-bind="::info.loc"
+        span ng-bind="::field.loc"
         span.glyphicon.glyphicon-off<

data/views/search_fields/list_select.slim

@@ -3,13 +3,13 @@
     .input-group.input-group-sm
       select.btn.btn-default [
         ng-model="action.query.search[f]"
-        ng-options="v[0] as v[1] for v in info.render.list"
+        ng-options="v[0] as v[1] for v in field.render.values"
         ng-change="action.search_field_change(f)"
-        ng-class="info.render.class"
+        ng-class="field.render.class"
         class="form-control"
         e2-search-field=""
       ]
-        option value="" ng-bind="::info.loc"
+        option value="" ng-bind="::field.loc"
 
       .input-group-btn
         a.btn.btn-default ng-disabled="action.query.search[f] == null" ng-click="action.query.search[f] = null; action.search_field_change(f)"

data/views/search_fields/scaffold_picker.slim

@@ -1,4 +1,4 @@
-e2-action action="[info.assoc, 'decode']"
+e2-action action="[field.assoc, 'decode']"
   .col-lg-3.col-md-4.col-sm-5
     .form-group
       .input-group.input-group-sm
@@ -7,7 +7,7 @@ e2-action action="[info.assoc, 'decode']"
           ng-click="action.open()"
           xe2-search-field=""
         ]
-          span ng-bind-html="action.decode || info.loc"
+          span ng-bind-html="action.decode || field.loc"
         .input-group-btn
           a.btn.btn-default ng-click="action.open()": span.glyphicon.glyphicon-list
           a.btn.btn-default ng-disabled="!action.decode" ng-click="action.reset()": span.glyphicon.glyphicon-off

data/views/search_fields/select_picker.slim

@@ -1,4 +1,4 @@
-e2-action action="[info.assoc, 'list']"
+e2-action action="[field.assoc, 'list']"
   .col-lg-3.col-md-4.col-sm-5
     .form-group
       .input-group.input-group-sm
@@ -6,11 +6,11 @@ e2-action action="[info.assoc, 'list']"
           ng-model="action.selected"
           ng-options="v.id as v.value for v in action.values"
           ng-change="action.change()"
-          ng-class="::info.render.class"
+          ng-class="::field.render.class"
           class="form-control"
         ]
 
-          option value="" ng-bind="::info.loc"
+          option value="" ng-bind="::field.loc"
         .input-group-btn
           a.btn.btn-default ng-disabled="!action.selected" ng-click="action.reset()"
             span.glyphicon.glyphicon-off

data/views/search_fields/typeahead_picker.slim

@@ -1,4 +1,4 @@
-e2-action action="[info.assoc, 'typeahead']"
+e2-action action="[field.assoc, 'typeahead']"
   .col-lg-3.col-md-4.col-sm-5
     .form-group
       .input-group.input-group-sm
@@ -8,11 +8,11 @@ e2-action action="[info.assoc, 'typeahead']"
           bs-options="v.value for v in action.load($viewValue)"
           ng-keypress="action.key_pressed = true"
 
-          ng-class="info.render.class"
+          ng-class="field.render.class"
           class="form-control"
 
-          data-animation="{{::info.render.animation}}"
-          placeholder="{{::info.loc}}"
+          data-animation="{{::field.render.animation}}"
+          placeholder="{{::field.loc}}"
           data-html="true"
           data-limit="10"
           bs-typeahead=""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine2
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - lopex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +173,7 @@ files:
 - views/fields/file_store.slim
 - views/fields/input_text.slim
 - views/fields/integer.slim
+- views/fields/list_bsmselect.slim
 - views/fields/list_bsselect.slim
 - views/fields/list_bsselect_opt.slim
 - views/fields/list_buttons.slim
@@ -247,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: Tree based routing framework with scaffolding support