Revision 7f16b9b1 snf-cyclades-app/synnefo/ui/static/snf/js/models.js
b/snf-cyclades-app/synnefo/ui/static/snf/js/models.js | ||
---|---|---|
54 | 54 |
// get url helper |
55 | 55 |
var getUrl = function(baseurl) { |
56 | 56 |
var baseurl = baseurl || snf.config.api_urls[this.api_type]; |
57 |
return baseurl + "/" + this.path; |
|
57 |
var append = "/"; |
|
58 |
if (baseurl.split("").reverse()[0] == "/") { |
|
59 |
append = ""; |
|
60 |
} |
|
61 |
return baseurl + append + this.path; |
|
58 | 62 |
} |
59 | 63 |
|
60 | 64 |
var NIC_REGEX = /^nic-([0-9]+)-([0-9]+)$/ |
... | ... | |
2304 | 2308 |
|
2305 | 2309 |
models.PublicKey = models.Model.extend({ |
2306 | 2310 |
path: 'keys', |
2307 |
base_url: '/ui/userdata',
|
|
2311 |
api_type: 'userdata',
|
|
2308 | 2312 |
details: false, |
2309 | 2313 |
noUpdate: true, |
2310 | 2314 |
|
... | ... | |
2331 | 2335 |
model: models.PublicKey, |
2332 | 2336 |
details: false, |
2333 | 2337 |
path: 'keys', |
2334 |
base_url: '/ui/userdata',
|
|
2338 |
api_type: 'userdata',
|
|
2335 | 2339 |
noUpdate: true, |
2336 | 2340 |
|
2337 | 2341 |
generate_new: function(success, error) { |
Also available in: Unified diff