poanetwork
/
poa-dapps-voting
mirror of https://github.com/poanetwork/poa-dapps-voting.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

It is not necessary to call AddValidator function on remove notary

This commit is contained in:
viktor 2017-06-16 18:23:27 +03:00
parent 1d6d6fabb0
commit f959f26c9d
2 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
assets/javascripts/application.js
View File

@ -962,24 +962,31 @@ $(function() {
return;
}
addValidator(api,
"addValidator(address,uint256,uint256,uint256,string,string,string)",
validatorViewObj,
votingKey,
config.Ethereum[config.environment].contractAddress,
function(txHash, err) {
if (err) {
$(".loading-container").hide();
showAlert(err, err.message);
return;
}
if (!ballotViewObj.addAction) {
getTxCallBack(txHash, function() {
$(".loading-container").hide();
$(".back").trigger("click");
});
} else {
addValidator(api,
"addValidator(address,uint256,uint256,uint256,string,string,string)",
validatorViewObj,
votingKey,
config.Ethereum[config.environment].contractAddress,
function(txHash, err) {
if (err) {
$(".loading-container").hide();
showAlert(err, err.message);
return;
}
getTxCallBack(txHash, function() {
$(".loading-container").hide();
$(".back").trigger("click");
});
}
);
getTxCallBack(txHash, function() {
$(".loading-container").hide();
$(".back").trigger("click");
});
}
);
}
}
);
});

41
assets/javascripts/application/index.js
View File

@ -137,24 +137,31 @@ $(function() {
return;
}
addValidator(api,
"addValidator(address,uint256,uint256,uint256,string,string,string)",
validatorViewObj,
votingKey,
config.Ethereum[config.environment].contractAddress,
function(txHash, err) {
if (err) {
$(".loading-container").hide();
showAlert(err, err.message);
return;
}
if (!ballotViewObj.addAction) {
getTxCallBack(txHash, function() {
$(".loading-container").hide();
$(".back").trigger("click");
});
} else {
addValidator(api,
"addValidator(address,uint256,uint256,uint256,string,string,string)",
validatorViewObj,
votingKey,
config.Ethereum[config.environment].contractAddress,
function(txHash, err) {
if (err) {
$(".loading-container").hide();
showAlert(err, err.message);
return;
}
getTxCallBack(txHash, function() {
$(".loading-container").hide();
$(".back").trigger("click");
});
}
);
getTxCallBack(txHash, function() {
$(".loading-container").hide();
$(".back").trigger("click");
});
}
);
}
}
);
});