Merge lp://staging/~gary/juju-gui/bug1167295 into lp://staging/juju-gui/experimental
Proposed by
Gary Poster
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 533 | ||||
Proposed branch: | lp://staging/~gary/juju-gui/bug1167295 | ||||
Merge into: | lp://staging/juju-gui/experimental | ||||
Diff against target: |
219 lines (+84/-10) 7 files modified
app/templates/unit.handlebars (+1/-1) app/views/topology/relation.js (+4/-4) app/views/utils.js (+35/-0) lib/views/stylesheet.less (+1/-0) test/test_environment_view.js (+14/-3) test/test_topology_relation.js (+4/-2) test/test_utils.js (+25/-0) |
||||
To merge this branch: | bzr merge lp://staging/~gary/juju-gui/bug1167295 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email:
|
Description of the change
Make safe relation ids in environment view
Relation ids included spaces and other problematic chacracters in our related DOM ids. This branch cleans those up, and also does a quick CSS cleanup to make some text legible again.
To post a comment you must log in.
Reviewers: mp+158224_ code.launchpad. net,
Message:
Please take a look.
Description:
Make safe relation ids in environment view
Relation ids included spaces and other problematic chacracters in our
related DOM ids. This branch cleans those up, and also does a quick CSS
cleanup to make some text legible again.
https:/ /code.launchpad .net/~gary/ juju-gui/ bug1167295/ +merge/ 158224
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/8640043/
Affected files: unit.handlebars topology/ relation. js stylesheet. less environment_ view.js topology_ relation. js
A [revision details]
M app/templates/
M app/views/
M app/views/utils.js
M lib/views/
M test/test_
M test/test_
M test/test_utils.js
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: test/test_ environment_ view.js environment_ view.js' environment_ view.js 2013-04-04 14:45:42 +0000 environment_ view.js 2013-04-10 21:17:18 +0000 g).use( [
'juju- views', 'juju-tests-utils', 'juju-env',
'node- event-simulate' , 'juju-gui', 'slider', 'juju-tests. utils') ; 'juju.views' );
parseInt( this.getAttribu te(e), 10))
.should. equal(true) ; generateSafeDOM Id('relation- 0000000007' )); isNotNull( node); isDefined( node);
=== modified file 'test/test_
--- test/test_
+++ test/test_
@@ -84,7 +84,7 @@
Y = YUI(GlobalConfi
- 'landscape', 'dump'
+ 'landscape', 'dump', 'juju-view-utils'
], function(Y) {
testUtils = Y.namespace(
views = Y.namespace(
@@ -170,6 +170,13 @@
}, line);
+
+ // Verify that the node id has been munged as expected from the
+ // relation id. This is particularly important for Juju Core.
+ var node = container.one(
+ '#' + views.utils.
+ assert.
+ assert.
});
it('must be able to render subordinate and normal services',
@@ -750,7 +757,9 @@
db: db,
env: env}).render();
- var relation = container. one('#relation- 0000000001 .rel-label'), generateSafeDOM Id('relation- 0000000001' ) +
dialog_ btn,
+ var relation = container.one(
+ '#' + views.utils.
+ ' .rel-label'),
panel;
@@ -778,7 +787,9 @@
env: env}).render();
// Get a subordinate relation. one('#relation- 0000000007 .rel-label'), generateSafeDOM Id('relation- 0000000007' ) +
dialog_ btn,
- var relation = container.
+ var relation = container.one(
+ '#' + views.utils.
+ ' .rel-label'),
panel;
Index: test/test_ topology_ relation. js topology_ relation. js' topology_ relation. js 2013-01-23 21:56:36 +0000 topology_ relation. js 2013-04-10 21:17:18 +0000
=== modified file 'test/test_
--- test/test_
+++ test/test_
@@ -4,7 +4,8 @@
var Y, views, view, container, topo, db;
...