Skip to content

Commit

Permalink
tweak wording
Browse files Browse the repository at this point in the history
  • Loading branch information
dshuffma-ibm committed Apr 3, 2017
1 parent ee8dfcb commit a03d51d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
4 changes: 3 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ function setup_marbles_lib() {

// --- Check Chaincode Compatibility --- //
marbles_lib.check_version(options, function (err, resp) {
if (!helper.errorWithVersions(resp)) {
if (helper.errorWithVersions(resp)) {
broadcast_state('no_chaincode');
} else {
broadcast_state('found_chaincode');
var user_base = null;
if (process.env.app_first_setup === 'yes') user_base = helper.getMarbleUsernames();
Expand Down
3 changes: 2 additions & 1 deletion routes/site_router.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ function get_credential_data() {
ca: helper.getCasUrl(0),
peer: helper.getPeersUrl(0),
chaincode_id: helper.getChaincodeId(),
marble_owners: helper.getMarbleUsernames()
chaincode_version: helper.getChaincodeVersion(),
marble_owners: helper.getMarbleUsernames(),
};
for (var i in ret) {
if (ret[i] == null) ret[i] = ''; //set to blank if not found
Expand Down
2 changes: 0 additions & 2 deletions utils/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,6 @@ module.exports = function (config_filename, logger) {
logger.warn('Install and instantiate v' + version[0] + '.x.x' + ' chaincode on channel ' + helper.getChannelId());
logger.warn('----------------------------------------------------------------------');
console.log('\n\n');
console.log('killing self');
process.exit(); //we die here
return true;
}
return false;
Expand Down
12 changes: 7 additions & 5 deletions views/panel_startup.jade
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,15 @@
br
br
.stepHelpTxt
p Whoops, we could not find the chaincode on your peer.
p Whoops, we could not find the correct chaincode
br
p Edit the options below to try again
p Edit the settings below to try again
p OR...
p Install and instantiate the chaincode if this is your first time using the application
strong
a(href="https://github.com/IBM-Blockchain/marbles/blob/v3.0/docs/install_chaincode.md" target="_blank" style="color:#fff;") How to install/instantiate chaincode
p
span If this is your first time using the application then 
a(href="https://github.com/IBM-Blockchain/marbles/blob/v3.0/docs/install_chaincode.md" target="_blank" style="color:#fff;") install/instantiate
span  marbles chaincode

br
.stepInputLegend Orderer
input(type="text" placeholder="Orderer ex: 192.168.99.100:5151" name="ordererUrl" value="#{bag.creds.orderer}").longer
Expand Down

0 comments on commit a03d51d

Please sign in to comment.