Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'Jasper9041-master'
  • Loading branch information
ratiw committed Sep 20, 2016
2 parents 4ce6a9c + c148aa7 commit e64e290
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -198,7 +198,7 @@ Then, reference the vuetable via `<vuetable>` tag as following
'lastname',
'nickname',
'birthdate',
'group.name_en'
'group.name_en',
'gender',
'last_login',
'__actions'
Expand Down
4 changes: 2 additions & 2 deletions dist/vue-table.js
Expand Up @@ -638,8 +638,8 @@ exports.default = {

var url = this.apiUrl + '?' + this.getAllQueryParams();
this.$http.get(url, this.httpData, this.httpOptions).then(function (response) {
self.tableData = self.getObjectValue(response.data, self.dataPath, null);
self.tablePagination = self.getObjectValue(response.data, self.paginationPath, null);
self.tableData = self.getObjectValue(response.body, self.dataPath, null);
self.tablePagination = self.getObjectValue(response.body, self.paginationPath, null);
if (self.tablePagination === null) {
console.warn('vuetable: pagination-path "' + self.paginationPath + '" not found. ' + 'It looks like the data returned from the sever does not have pagination information ' + 'or you may have set it incorrectly.');
}
Expand Down
2 changes: 1 addition & 1 deletion dist/vue-table.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/bootstrap.html
Expand Up @@ -268,7 +268,7 @@ <h4 class="panel-title">Visible fields</h4>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment-with-locales.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/1.0.24/vue.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue-resource/0.7.0/vue-resource.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue-resource/1.0.2/vue-resource.min.js"></script>
<script src="../dist/vue-table.js"></script>
<script>
var E_SERVER_ERROR = 'Error communicating with the server'
Expand Down
2 changes: 1 addition & 1 deletion examples/semantic.html
Expand Up @@ -194,7 +194,7 @@ <h3 class="ui header">List of Users</h3>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment-with-locales.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/1.0.26/vue.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue-resource/0.7.0/vue-resource.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue-resource/1.0.2/vue-resource.min.js"></script>
<script src="../dist/vue-table.js"></script>
<script>
$('#settingsModal').modal({
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -4,8 +4,8 @@
"description": "vue.js table component that will automatically request JSON data from server and display them nicely in HTML table with swap-able/extensible pagination component",
"main": "dist/vue-table.js",
"dependencies": {
"vue": "~1.0.21",
"vue-resource": "~0.7"
"vue": "^1.0.26",
"vue-resource": "^1.0.2"
},
"directories": {
"example": "examples"
Expand Down
4 changes: 2 additions & 2 deletions src/components/Vuetable.vue
Expand Up @@ -423,8 +423,8 @@ export default {
var url = this.apiUrl + '?' + this.getAllQueryParams()
this.$http.get(url, this.httpData, this.httpOptions)
.then(function(response) {
self.tableData = self.getObjectValue(response.data, self.dataPath, null)
self.tablePagination = self.getObjectValue(response.data, self.paginationPath, null)
self.tableData = self.getObjectValue(response.body, self.dataPath, null)
self.tablePagination = self.getObjectValue(response.body, self.paginationPath, null)
if (self.tablePagination === null) {
console.warn('vuetable: pagination-path "' + self.paginationPath + '" not found. '
+ 'It looks like the data returned from the sever does not have pagination information '
Expand Down

0 comments on commit e64e290

Please sign in to comment.