Conflicted service values cause notification in deployer bar summary

[hatched]

If the user has changed a configuration value and then another one comes in over the delta before they have committed then their config value is in a conflicted state. In the deployer bar summary we now show them the services which have conflicted values and allow them to go resolve the issues.

[mitechie]

s/conflicted/conflicting it's not past tense.

[mitechie]

I'd go simpler "click the links below to resolve these conflicts before continuing."

[mitechie]

looks good at a first glance, a couple of nitpick wording comments.

[hatched]

Manually running CI http://ci.jujugui.org:8080/job/juju-gui/2012/

[hatched]

To QA

• Deploy/Commit MySQL
• Open it's configuration panel and change binlog-format to something.
• Save the configuration change
• Open the console and run app.db.services.item(0).updateConfig({'binlog-format': 'fffffooooo'});
• The input should now have a orange !.
• Close the inspector
• Click commit to open up the deployer bar summary.
• There should be a notification saying that there is a conflict.
• Click the link to mysql
• It should close the summary and open the inspector.

[mitechie]

👍

[jcsackett]

👍

[jcsackett]

QA notes:

• I followed the QA directions, they worked as expected.
• I committed mysql and played around with non conflicted configs on both without issue.
• I created conflicted configs in both services, and saw the appropriate warning on commit, and the links worked.

I'll note that the links are a little odd--an unordered list might make more sense than placing them inline.

QA OK.

[hatched]

Thanks for the reviews. The manually triggered run passed.

[jujugui]

Status: merge request accepted. Url: http://ci.jujugui.org:8080/job/juju-gui-merge