Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge "Partial-Bug: #1537225 Fixed delete in config db using model to…
… show proper errors." into R3.0
- Loading branch information
Showing
4 changed files
with
130 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
webroot/setting/configdb/ui/js/models/ConfigDatabaseModel.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Copyright (c) 2014 Juniper Networks, Inc. All rights reserved. | ||
| */ | ||
|
|
||
| define([ | ||
| 'underscore', | ||
| 'contrail-model' | ||
| ], function (_, ContrailModel) { | ||
| var ConfigDatabaseModel = ContrailModel.extend({ | ||
|
|
||
| deleteRecord: function (checkedRow, callbackObj, type) { | ||
| var ajaxConfig = {}, that = this, url; | ||
|
|
||
| if (type == ctwc.DELETE_KEY_TYPE) { | ||
| url = "/api/query/cassandra/key/" + checkedRow.table + "/" + checkedRow.key; | ||
| } else if (type == ctwc.DELETE_KEY_VALUE_TYPE) { | ||
| url = "/api/query/cassandra/value/" + checkedRow.table + "/" + checkedRow.key + "/" + checkedRow.keyvalue; | ||
| } | ||
|
|
||
| ajaxConfig.type = "DELETE"; | ||
| ajaxConfig.url = url; | ||
|
|
||
| contrail.ajaxHandler(ajaxConfig, function () { | ||
| if (contrail.checkIfFunction(callbackObj.init)) { | ||
| callbackObj.init(); | ||
| } | ||
| }, function (response) { | ||
| if (contrail.checkIfFunction(callbackObj.success)) { | ||
| callbackObj.success(); | ||
| } | ||
| }, function (error) { | ||
| console.log(error); | ||
| if (contrail.checkIfFunction(callbackObj.error)) { | ||
| callbackObj.error(error); | ||
| } | ||
| }); | ||
| }, | ||
| validations : {} | ||
| }); | ||
| return ConfigDatabaseModel; | ||
| }); |
55 changes: 55 additions & 0 deletions
55
webroot/setting/configdb/ui/js/views/ConfigDatabaseActionView.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Copyright (c) 2014 Juniper Networks, Inc. All rights reserved. | ||
| */ | ||
|
|
||
| define([ | ||
| 'underscore', | ||
| 'contrail-view', | ||
| 'knockback' | ||
| ], function (_, ContrailView, Knockback) { | ||
|
|
||
| var modalId = ctwl.CDB_DELETE_MODAL_ID_, | ||
| ConfigDatabaseActionView = ContrailView.extend({ | ||
|
|
||
| renderDeleteRecord: function (options) { | ||
| var textTemplate = contrail.getTemplate4Id(ctwl.CDB_TMPL_DELETE_RECORD), | ||
| elId = 'deleteRecord', | ||
| self = this, | ||
| checkedRows = options['checkedRows'], | ||
| recordsToBeDeleted = {'elementId': elId, 'checkedRows': checkedRows}; | ||
|
|
||
| cowu.createModal({ | ||
| 'modalId' : modalId, | ||
| 'className': 'modal-700', | ||
| 'title' : options['title'], | ||
| 'btnName' : 'Confirm', | ||
| 'body' : textTemplate(recordsToBeDeleted), | ||
| 'onSave' : function () { | ||
| self.model.deleteRecord(options['checkedRows'], { | ||
| init : function () { | ||
| self.model.showErrorAttr(elId, false); | ||
| cowu.enableModalLoading(modalId); | ||
| }, | ||
| success: function () { | ||
| options['callback'](); | ||
| $("#" + modalId).modal('hide'); | ||
| }, | ||
| error : function (error) { | ||
| cowu.disableModalLoading(modalId, function () { | ||
| self.model.showErrorAttr(elId, error.responseText); | ||
| }); | ||
| } | ||
| }, options['type']); | ||
| }, | ||
| 'onCancel' : function () { | ||
| $("#" + modalId).modal('hide'); | ||
| } | ||
| }); | ||
|
|
||
| self.model.showErrorAttr(elId, false); | ||
| Knockback.applyBindings(this.model, document.getElementById(modalId)); | ||
| kbValidation.bind(this); | ||
| }, | ||
| }); | ||
| return ConfigDatabaseActionView; | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters