Started xosForm component
diff --git a/views/ngXosViews/sampleView/bower.json b/views/ngXosViews/sampleView/bower.json
index cc5fc64..625ae53 100644
--- a/views/ngXosViews/sampleView/bower.json
+++ b/views/ngXosViews/sampleView/bower.json
@@ -23,7 +23,7 @@
"angular-ui-router": "0.2.15",
"angular-cookies": "1.4.7",
"angular-resource": "1.4.7",
- "ng-lodash": "0.3.0",
+ "lodash": "~4.11.1",
"bootstrap-css": "3.3.6"
}
}
diff --git a/views/ngXosViews/sampleView/env/default.js b/views/ngXosViews/sampleView/env/default.js
index 353973a..40d6f99 100644
--- a/views/ngXosViews/sampleView/env/default.js
+++ b/views/ngXosViews/sampleView/env/default.js
@@ -8,6 +8,6 @@
module.exports = {
host: 'http://xos.dev:9999/',
- xoscsrftoken: 'jkKF9NebQoyaxKFT42l1EFjGx6ESPuP4',
- xossessionid: 'kvq9qxycbu0298wxfg8v11at94q9m819'
+ xoscsrftoken: 'WNQMpHGMRQQ2OKCthe4Dn1jahGRAkPhA',
+ xossessionid: '7jjj6iogkyyrvdks93dhlk6mr311kl2l'
};
diff --git a/views/ngXosViews/sampleView/src/index.html b/views/ngXosViews/sampleView/src/index.html
index d04fc3b..7563ffc 100644
--- a/views/ngXosViews/sampleView/src/index.html
+++ b/views/ngXosViews/sampleView/src/index.html
@@ -17,7 +17,7 @@
<script src="vendor/angular-ui-router/release/angular-ui-router.js"></script>
<script src="vendor/angular-cookies/angular-cookies.js"></script>
<script src="vendor/angular-resource/angular-resource.js"></script>
-<script src="vendor/ng-lodash/build/ng-lodash.js"></script>
+<script src="vendor/lodash/lodash.js"></script>
<script src="vendor/bootstrap-css/js/bootstrap.min.js"></script>
<!-- endbower --><!-- endjs -->
<!-- inject:js -->
diff --git a/views/ngXosViews/sampleView/src/js/main.js b/views/ngXosViews/sampleView/src/js/main.js
index b00aa0b..6f4d045 100644
--- a/views/ngXosViews/sampleView/src/js/main.js
+++ b/views/ngXosViews/sampleView/src/js/main.js
@@ -3,7 +3,6 @@
angular.module('xos.sampleView', [
'ngResource',
'ngCookies',
- 'ngLodash',
'ui.router',
'xos.helpers'
])
@@ -54,9 +53,9 @@
],
filter: 'field',
order: true,
- // pagination: {
- // pageSize: 6
- // }
+ pagination: {
+ pageSize: 3
+ }
};
this.alertConfig = {
@@ -64,11 +63,29 @@
closeBtn: true
}
+ this.formConfig = {
+ exclude: ['password'],
+ fields: {
+ last_login: {
+ type: 'date'
+ }
+ },
+ actions: [
+ {
+ label: 'Save',
+ icon: 'ok', // refers to bootstraps glyphicon
+ cb: (user) => { // receive the model
+ console.log(user);
+ },
+ class: 'success'
+ }
+ ]
+ }
// retrieving user list
Users.query().$promise
.then((users) => {
- this.users = users;
+ this.users = users.concat(users).concat(users);
})
.catch((e) => {
throw new Error(e);
diff --git a/views/ngXosViews/sampleView/src/templates/users-list.tpl.html b/views/ngXosViews/sampleView/src/templates/users-list.tpl.html
index c0c58cb..f79f9ba 100644
--- a/views/ngXosViews/sampleView/src/templates/users-list.tpl.html
+++ b/views/ngXosViews/sampleView/src/templates/users-list.tpl.html
@@ -5,7 +5,11 @@
</div>
</div>
- <xos-alert config="vm.alertConfig">Alert message Here</xos-alert>
+<div class="row">
+ <div class="col-xs-12">
+ <!-- <xos-form ng-model="vm.users[0]" config="vm.formConfig"></xos-form> -->
+ </div>
+</div>
<div class="row">
<div class="col-xs-12">