btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Always save non replaced uri, but display replaced url in the UI

Browse Source
This commit is contained in:
Samir L. Boulema
2020-05-08 23:04:02 +02:00
parent ab6de361ab
commit c655d55197
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pages/index.vue
View File

@@ -2182,6 +2182,7 @@ export default {
let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript) let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript)
environmentVariables = addPathParamsToVariables(this.params, environmentVariables) environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
entry.path = parseTemplateString(entry.path, environmentVariables) entry.path = parseTemplateString(entry.path, environmentVariables)
entry.url = parseTemplateString(entry.url, environmentVariables)
} }
this.$refs.historyComponent.addEntry(entry) this.$refs.historyComponent.addEntry(entry)
@@ -2214,6 +2215,7 @@ export default {
let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript) let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript)
environmentVariables = addPathParamsToVariables(this.params, environmentVariables) environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
entry.path = parseTemplateString(entry.path, environmentVariables) entry.path = parseTemplateString(entry.path, environmentVariables)
entry.url = parseTemplateString(entry.url, environmentVariables)
} }
this.$refs.historyComponent.addEntry(entry) this.$refs.historyComponent.addEntry(entry)
@@ -2605,9 +2607,10 @@ export default {
}) })
return return
} }
let urlAndPath = parseUrlAndPath(this.uri)
this.editRequest = { this.editRequest = {
url: this.url, url: urlAndPath.url,
path: this.path, path: urlAndPath.path,
method: this.method, method: this.method,
auth: this.auth, auth: this.auth,
httpUser: this.httpUser, httpUser: this.httpUser,
@@ -2627,9 +2630,6 @@ export default {
if (this.selectedRequest.url) { if (this.selectedRequest.url) {
this.editRequest = Object.assign({}, this.selectedRequest, this.editRequest) this.editRequest = Object.assign({}, this.selectedRequest, this.editRequest)
} }
let result = parseUrlAndPath(this.uri)
this.url = result.url
this.path = result.path
this.showRequestModal = true this.showRequestModal = true
}, },
hideRequestModal() { hideRequestModal() {