lp://staging/~gary/juju-gui/fixTrunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/juju-gui/experimental at revision 1043

Juju GUI Hackers: Pending requested 2013-09-13

Diff: 12 lines (+1/-1)

1 file modified

app/templates/service-relations-list.handlebars (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1043. By Gary Poster on 2013-09-13

spelling tweak

1042. By Gary Poster on 2013-09-13

Hook up cancel buttons in the inspector

This branch simply hooks up the cancel buttons, which thanks to groundwork from Ben that I worked on in previous branches, is a one liner for each button.

R=benjamin.saller
CC=
https://codereview.appspot.com/13677044

1041. By Richard Harding on 2013-09-13

Updated how unitName is sent to resolve/retry

The inspector was create an array[array] and thus passing the resovled()
method an array as a unitName. The go back end expects a string and it
refused to resolve/retry anything.

- Update the inspector method to make sure it grabs a single string
- Update the tests for the inspector to look for a single string
- Add a quick assertion in the go backend to fuss if it doesn't get a string

QA:

Note: MySQL always fails for me in my local lxc go environment

- Bootstrap a go environment in lxc, deploy mysql into it. I setup 3 units.
- Wait for the units to go into error state.
- Pick one of the units, resolve the unit.
- After a bit it should go to running and you can destroy it properly.
- Note that you can also watch the WS traffic in chrome dev tools and verify
that your request/response was successful.

Example broken communication:

{"RequestId":31,"Error":"json: cannot unmarshal array into Go value of type string","Response":{}}
{"Type":"Client","Request":"Resolved","Params":{"UnitName":["mysql/0"],"Retry":false},"RequestId":32}

R=benji
CC=
https://codereview.appspot.com/13706043

1040. By Jeff Pihach on 2013-09-13

Moves the expose toggle to the inspector overview

Shares styling and markup for a consistent UI across
the different viewlets. Also hooked up to the databinding
engine.

R=
CC=
https://codereview.appspot.com/13684043

1039. By Gary Poster on 2013-09-13

Eliminate unnecessary conflicts

Fixes the following issues:
 * If you change one model parent.child value (e.g. constraints.arch) in the inspector and then set a model parent.child value (e.g., constaints.cpu-cores) in the db, you will get an unnecessary conflict on the arch.
 * resetDOMToModel could not clear conflicts.

I also added a lot of comments, and a couple of tests for pre-existing functionality that I broke during my refactoring.

R=rharding, benjamin.saller
CC=
https://codereview.appspot.com/13340047

1038. By Gary Poster on 2013-09-13

Fix lint and tests

Tweak code so tests pass.

R=
CC=
https://codereview.appspot.com/13250048

1037. By Brad Crittenden on 2013-09-12

[r=rick_h] Add GA_key as a config variable. Remove useAnalytics. Turn off GA by setting the key to blank.

1036. By Benji York on 2013-09-12

More/tweaked tests for the charmworld v2 API

The code was also tweaked in directions suggested by the new/refactored tests.

1035. By Richard Harding on 2013-09-12

Update conflict ux per updated design.

- design images: https://www.dropbox.com/sh/kuzzisylxrozkbe/iUR0SPSIXL#/
- Update checkboxes to be a slider widget, two levels tall
- Display the True/False value and keep it in sync
- Update the Expose/Use default setting checkboxes to match the updated design
- Update conflict settings for the conflict-pending with the new smaller image

R=jeff.pihach, bac
CC=
https://codereview.appspot.com/13516044

1034. By Huw Wilkins on 2013-09-12

Style the relations tab

This branch styles the relations tab as per design.

It also adds icons for the active state of the inspector tabs.
(Landing for Huw)

R=jeff.pihach
CC=
https://codereview.appspot.com/13333053