Skip to content

Commit

Permalink
Merge pull request #106 from marmelab/fix_validation
Browse files Browse the repository at this point in the history
[RFR] Fix validation
  • Loading branch information
manuquentin committed Nov 13, 2014
2 parents 49c54fb + a5e898e commit 0890387
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 16 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-admin",
"version": "0.3.0",
"version": "0.3.1",
"dependencies": {
"angular": "~1.3.1",
"angular-bootstrap": "~0.11.0",
Expand Down
2 changes: 1 addition & 1 deletion build/ng-admin.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions build/ng-admin.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/ng-admin.min.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-admin",
"version": "0.3.0",
"version": "0.3.1",
"private": false,
"main": "build/ng-admin.min.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/javascripts/config-dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
.limit(5) // limit the panel to the 5 latest posts
.pagination(pagination) // use the custom pagination function to format the API request correctly
.label('Recent posts')
.addField(new Field('title').map(truncate))
.addField(new Field('title').isEditLink(true).map(truncate))
)
.addView(new ListView('post-list') // initialize the datagrid
.title('All posts') // default title is "List of posts"
Expand Down
4 changes: 3 additions & 1 deletion src/javascripts/ng-admin/Crud/view/field/email.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
class="{{ field.getCssClasses() }}"
type="email"
ng-model="entry.values[field.name()]"
ng-required="field.validation().required" />
ng-required="field.validation().required"
ng-minlength="{{ field.validation().minlength }}"
ng-maxlength="{{ field.validation().maxlength }}"/>
4 changes: 2 additions & 2 deletions src/javascripts/ng-admin/Crud/view/field/password.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
type="password"
ng-model="entry.values[field.name()]"
ng-required="field.validation().required"
ng-minlength="field.validation().minlength"
maxlength="{{ field.validation().maxlength }}" />
ng-minlength="{{ field.validation().minlength }}"
ng-maxlength="{{ field.validation().maxlength }}" />
4 changes: 2 additions & 2 deletions src/javascripts/ng-admin/Crud/view/field/string.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
class="{{ field.getCssClasses() }}"
type="text"
ng-model="entry.values[field.name()]"
ng-required="field.validation().required"
maxlength="{{ field.validation().maxlength }}" />
ng-minlength="{{ field.validation().minlength }}"
ng-maxlength="{{ field.validation().maxlength }}" />
3 changes: 2 additions & 1 deletion src/javascripts/ng-admin/Crud/view/field/text.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
class="form-control"
ng-model="entry.values[field.name()]"
ng-required="field.validation().required"
maxlength="{{ field.validation().maxlength }}"></textarea>
ng-minlength="{{ field.validation().minlength }}"
ng-maxlength="{{ field.validation().maxlength }}"></textarea>
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ define(function (require) {
dashboard: true,
validation: {
required: false,
maxlength: false
minlength: 0,
maxlength: 99999 // We can't remove ng-maxlength directive
},
choices: [],
defaultValue: null,
Expand Down
2 changes: 1 addition & 1 deletion src/sass/ng-admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ menu {
background-color: #FFFFFF;

a {
color: #000000;
color: #428bca;
cursor: pointer;
}

Expand Down

0 comments on commit 0890387

Please sign in to comment.