Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow decimals in number (float) type input + builtinAdaptersPath fix #712

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow decimals in number (float) type input + builtinAdaptersPath fix #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8856487
Allow decimals in number-type input
Mar 28, 2016
fa8802a
Made builtinAdaptersPath independent from model's install location
Mar 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion gen/scaffold/realtime/views/ejs/form.html.ejs.ejs
View file
Open in desktop
Expand Up @@ -11,8 +11,10 @@
<% } -%>
<% } else if(properties[i].type === 'text') { -%>
<@- contentTag('textarea', <%= names.property.singular %>.<%= properties[i].name %>, {class: 'form-control', name: '<%= properties[i].name %>', rows: 10}) @>
<% } else if(properties[i].type === 'number' || properties[i].type === 'int') { -%>
<% } else if(properties[i].type === 'int') { -%>
<@- contentTag('input', <%= names.property.singular %>.<%= properties[i].name %>, {type:'number', class:'form-control', name:'<%= properties[i].name %>'}) @>
<% } else if(properties[i].type === 'number') { -%>
<@- contentTag('input', <%= names.property.singular %>.<%= properties[i].name %>, {type:'number', step:'any', class:'form-control', name:'<%= properties[i].name %>'}) @>
<% } else if(properties[i].type === 'boolean') { -%>
<select name="<%= properties[i].name %>", class="col-md-1">
<@ if(<%= names.property.singular %>.<%= properties[i].name %>) { -@>
Expand Down
4 changes: 3 additions & 1 deletion gen/scaffold/realtime/views/jade/form.html.jade.ejs
View file
Open in desktop
Expand Up @@ -11,8 +11,10 @@
<% } -%>
<% } else if(properties[i].type === 'text') { -%>
!= contentTag('textarea', <%= names.property.singular %>.<%= properties[i].name %>, {class: 'form-control', name: '<%= properties[i].name %>', rows: 10})
<% } else if(properties[i].type === 'number' || properties[i].type === 'int') { -%>
<% } else if(properties[i].type === 'int') { -%>
!= contentTag('input', <%= names.property.singular %>.<%= properties[i].name %>, {type:'number', class:'form-control', name:'<%= properties[i].name %>'})
<% } else if(properties[i].type === 'number') { -%>
!= contentTag('input', <%= names.property.singular %>.<%= properties[i].name %>, {type:'number', step:'any', class:'form-control', name:'<%= properties[i].name %>'})
<% } else if(properties[i].type === 'boolean') { -%>
select.span1(name="<%= properties[i].name %>")
if <%= names.property.singular %>.<%= properties[i].name %>
Expand Down
4 changes: 3 additions & 1 deletion gen/scaffold/realtime/views/swig/add.html.swig.ejs
View file
Open in desktop
Expand Up @@ -25,8 +25,10 @@
<% } -%>
<% } else if(properties[i].type === 'text') { -%>
<textarea rows="10" class="col-md-6" name="<%= properties[i].name %>"></textarea>
<% } else if(properties[i].type === 'number' || properties[i].type === 'int') { -%>
<% } else if(properties[i].type === 'int') { -%>
<input type="number" class="col-md-2" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'number') { -%>
<input type="number" step="any" class="col-md-2" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'boolean') { -%>
<select name="<%= properties[i].name %>", class="col-md-1">
{% if <%= names.property.singular %>.<%= properties[i].name %> %}
Expand Down
4 changes: 3 additions & 1 deletion gen/scaffold/realtime/views/swig/edit.html.swig.ejs
View file
Open in desktop
Expand Up @@ -25,8 +25,10 @@
<% } -%>
<% } else if(properties[i].type === 'text') { -%>
<textarea rows="10" class="form-control" name="<%= properties[i].name %>">{{<%= names.property.singular %>.<%= properties[i].name %>}}</textarea>
<% } else if(properties[i].type === 'number' || properties[i].type === 'int') { -%>
<% } else if(properties[i].type === 'int') { -%>
<input type="number" class="form-control" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'number') { -%>
<input type="number" step="any" class="form-control" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'boolean') { -%>
<select name="<%= properties[i].name %>", class="col-md-1">
{% if <%= names.property.singular %>.<%= properties[i].name %> %}
Expand Down
4 changes: 3 additions & 1 deletion gen/scaffold/views/ejs/form.html.ejs.ejs
View file
Open in desktop
Expand Up @@ -11,8 +11,10 @@
<% } -%>
<% } else if(properties[i].type === 'text') { -%>
<@- contentTag('textarea', <%= names.property.singular %>.<%= properties[i].name %>, {class: 'form-control', name: '<%= properties[i].name %>', rows: 10}) @>
<% } else if(properties[i].type === 'number' || properties[i].type === 'int') { -%>
<% } else if(properties[i].type === 'int') { -%>
<@- contentTag('input', <%= names.property.singular %>.<%= properties[i].name %>, {type:'number', class:'form-control', name:'<%= properties[i].name %>'}) @>
<% } else if(properties[i].type === 'number') { -%>
<@- contentTag('input', <%= names.property.singular %>.<%= properties[i].name %>, {type:'number', step:'any', class:'form-control', name:'<%= properties[i].name %>'}) @>
<% } else if(properties[i].type === 'boolean') { -%>
<select name="<%= properties[i].name %>", class="col-md-1">
<@ if(<%= names.property.singular %>.<%= properties[i].name %>) { -@>
Expand Down
4 changes: 3 additions & 1 deletion gen/scaffold/views/handlebars/form.html.hbs.ejs
View file
Open in desktop
Expand Up @@ -11,8 +11,10 @@
<% } -%>
<% } else if(properties[i].type === 'text') { -%>
<textarea rows="10" class="form-control" name="<%= properties[i].name %>">{{<%= names.property.singular %>.<%= properties[i].name %>}}</textarea>
<% } else if(properties[i].type === 'number' || properties[i].type === 'int') { -%>
<% } else if(properties[i].type === 'int') { -%>
<input type="number" class="form-control" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'number') { -%>
<input type="number" step="any" class="form-control" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'boolean') { -%>
<select name="<%= properties[i].name %>", class="col-md-1">
{% if <%= names.property.singular %>.<%= properties[i].name %> %}
Expand Down
4 changes: 3 additions & 1 deletion gen/scaffold/views/jade/form.html.jade.ejs
View file
Open in desktop
Expand Up @@ -11,8 +11,10 @@
<% } -%>
<% } else if(properties[i].type === 'text') { -%>
!= contentTag('textarea', <%= names.property.singular %>.<%= properties[i].name %>, {class: 'form-control', name: '<%= properties[i].name %>', rows: 10})
<% } else if(properties[i].type === 'number' || properties[i].type === 'int') { -%>
<% } else if(properties[i].type === 'int') { -%>
!= contentTag('input', <%= names.property.singular %>.<%= properties[i].name %>, {type:'number', class:'form-control', name:'<%= properties[i].name %>'})
<% } else if(properties[i].type === 'number') { -%>
!= contentTag('input', <%= names.property.singular %>.<%= properties[i].name %>, {type:'number', step:'any', class:'form-control', name:'<%= properties[i].name %>'})
<% } else if(properties[i].type === 'boolean') { -%>
select.span1(name="<%= properties[i].name %>")
if <%= names.property.singular %>.<%= properties[i].name %>
Expand Down
4 changes: 3 additions & 1 deletion gen/scaffold/views/mustache/form.html.ms.ejs
View file
Open in desktop
Expand Up @@ -11,8 +11,10 @@
<% } -%>
<% } else if(properties[i].type === 'text') { -%>
<textarea rows="10" class="form-control" name="<%= properties[i].name %>">{{<%= names.property.singular %>.<%= properties[i].name %>}}</textarea>
<% } else if(properties[i].type === 'number' || properties[i].type === 'int') { -%>
<% } else if(properties[i].type === 'int') { -%>
<input type="number" class="form-control" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'number') { -%>
<input type="number" step="any" class="form-control" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'boolean') { -%>
<select name="<%= properties[i].name %>", class="col-md-1">
{% if <%= names.property.singular %>.<%= properties[i].name %> %}
Expand Down
4 changes: 3 additions & 1 deletion gen/scaffold/views/swig/add.html.swig.ejs
View file
Open in desktop
Expand Up @@ -25,8 +25,10 @@
<% } -%>
<% } else if(properties[i].type === 'text') { -%>
<textarea rows="10" class="col-md-6" name="<%= properties[i].name %>"></textarea>
<% } else if(properties[i].type === 'number' || properties[i].type === 'int') { -%>
<% } else if(properties[i].type === 'int') { -%>
<input type="number" class="col-md-2" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'number') { -%>
<input type="number" step="any" class="col-md-2" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'boolean') { -%>
<select name="<%= properties[i].name %>", class="col-md-1">
{% if <%= names.property.singular %>.<%= properties[i].name %> %}
Expand Down
4 changes: 3 additions & 1 deletion gen/scaffold/views/swig/edit.html.swig.ejs
View file
Open in desktop
Expand Up @@ -25,8 +25,10 @@
<% } -%>
<% } else if(properties[i].type === 'text') { -%>
<textarea rows="10" class="form-control" name="<%= properties[i].name %>">{{<%= names.property.singular %>.<%= properties[i].name %>}}</textarea>
<% } else if(properties[i].type === 'number' || properties[i].type === 'int') { -%>
<% } else if(properties[i].type === 'int') { -%>
<input type="number" class="form-control" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'number') { -%>
<input type="number" step="any" class="form-control" name="<%= properties[i].name %>" value="{{<%= names.property.singular %>.<%= properties[i].name %>}}" />
<% } else if(properties[i].type === 'boolean') { -%>
<select name="<%= properties[i].name %>", class="col-md-1">
{% if <%= names.property.singular %>.<%= properties[i].name %> %}
Expand Down
4 changes: 2 additions & 2 deletions lib/init/model.js
View file
Open in desktop
Expand Up @@ -42,8 +42,8 @@
this.config = null;

this.loadAdapterForModel = function (modelItem, cb) {
var builtinAdaptersPath = path.join(__dirname,
'../../node_modules/model/lib/adapters')
var builtinAdaptersPath = path.join(path.dirname(require.resolve('model')),
'/adapters')
, cwd = process.cwd()
, modelDir = path.join('app/models')
, appAdaptersPath = path.join(cwd, modelDir, 'adapters')
Expand Down