Skip to content

Commit

Permalink
#5 - Bug fix - Issue 5 - Axios config not being loaded with GET metho…
Browse files Browse the repository at this point in the history
…d and Delegate false.
  • Loading branch information
syshex committed Aug 11, 2017
1 parent 1ebdc93 commit cf240e0
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

### 1.1.8 (August 11, 2017)

* Bug fix - Issue 5 - Axios config not being loaded with GET method and Delegate false.

### 1.1.7 (August 10, 2017)

* Allowing Axios configuration to be passed for the requests
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

vue-bootstrap-table is a sortable and searchable table, with Bootstrap styling, for Vue.js.

### VUE 2 : 1.1.7
### VUE 2 : 1.1.8

### Vue 1 : [jbaysolutions/vue-bootstrap-table](https://github.com/jbaysolutions/vue-bootstrap-table)

Expand Down Expand Up @@ -488,6 +488,10 @@ If you have a feature request, please add it as an issue or make a pull request.

## Changelog

### 1.1.8

* Bug fix - Issue 5 - Axios config not being loaded with GET method and Delegate false.

### 1.1.7

* Allowing Axios configuration to be passed for the requests
Expand Down
12 changes: 11 additions & 1 deletion dist/vue-bootstrap-table.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-bootstrap-table.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/vue-bootstrap-table.min.js

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": "vue2-bootstrap-table2",
"version": "1.1.7",
"version": "1.1.8",
"description": "A sortable and searchable vue table, as a Vue component, using bootstrap styling.",
"keywords": [
"table",
Expand Down
10 changes: 10 additions & 0 deletions src/VueBootstrapTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,16 @@
}
//console.log(JSON.stringify(ajaxParameters));
}
if( this.ajax.enabled && !this.ajax.delegate ) {
if ( this.ajax.method=== "GET" ) {
//COPY
ajaxParameters = JSON.parse(JSON.stringify(this.ajax.axiosConfig));
ajaxParameters.params = {};
}
if ( this.ajax.method=== "POST" ) {
// Do nothing at this point !
}
}
if (this.ajax.enabled && this.ajax.method === "GET") {
axios.get(self.ajax.url, ajaxParameters )
.then(response => {
Expand Down

0 comments on commit cf240e0

Please sign in to comment.