Merge lp:~gary/juju-gui/fixTrunk into lp:juju-gui/experimental

[Gary Poster]

Trivial spelling fix

https://codereview.appspot.com/13250048/

[Gary Poster (gary)]

Reviewers: mp+185409_code.launchpad.net,

Message:
Please take a look.

Description:
Fix lint and tests

Tweak code so tests pass.

https://code.launchpad.net/~gary/juju-gui/fixTrunk/+merge/185409

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/13250048/

Affected files (+9, -6 lines):
   A [revision details]
   M app/app.js
   M app/config-debug.js
   M app/config-prod.js
   M app/models/models.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: app/app.js
=== modified file 'app/app.js'
--- app/app.js 2013-09-12 18:15:47 +0000
+++ app/app.js 2013-09-13 03:34:55 +0000
@@ -1324,7 +1324,7 @@
       */
      authorizeCookieUse: function(req, res, next) {
        var ga_key = this.get('GA_key');
- if (ga_key != '') {
+ if (ga_key) {
          this.cookieHandler = this.cookieHandler || new Y.juju.Cookies();
          this.cookieHandler.check();
        }

Index: app/config-debug.js
=== modified file 'app/config-debug.js'
--- app/config-debug.js 2013-09-12 20:02:37 +0000
+++ app/config-debug.js 2013-09-13 03:34:55 +0000
@@ -47,9 +47,9 @@
    // There is also a hotkey to toggle the simulator.
    simulateEvents: true,
    readOnly: false,
- // Set the GA_key to enable Google Analytics usage and calls. Also
implies using cookies.
- // For the debug configuration, the GA_key should be blank to prevent
- // muddying the gathered statistics.
+ // Set the GA_key to enable Google Analytics usage and calls. Also
implies
+ // using cookies. For the debug configuration, the GA_key should be
blank to
+ // prevent muddying the gathered statistics.
    GA_key: '',
    login_help: 'For this demonstration, use the password "admin" to
connect.',
    isJujucharms: false,

Index: app/config-prod.js
=== modified file 'app/config-prod.js'
--- app/config-prod.js 2013-09-12 18:15:47 +0000
+++ app/config-prod.js 2013-09-13 03:34:55 +0000
@@ -46,7 +46,8 @@
    // You can also use the :flags:/simulateEvents feature flag.
    simulateEvents: false,
    readOnly: false,
- // Set the GA_key to enable Google Analytics usage and calls. Also
implies using cookies.
+ // Set the GA_key to enable Google Analytics usage and calls. Also
implies
+ // using cookies.
    GA_key: 'UA-41463568-2',
    login_help: (
        'The password is the admin-secret from the Juju environment. This
can ' +

Index: app/models/models.js
=== modified file 'app/models/models.js'
--- app/models/models.js 2013-09-11 21:17:51 +0000
+++ app/models/models.js 2013-09-13 03:34:55 +0000
@@ -221,7 +221,7 @@
        using the supplied relationId.

        @method removeRelations
- @param {String} relationId of the relation to remove;
+ @param {String} relationId The id of the relation to remove.
      */
      removeRelations: function(relationId) {
        var relations = this.get('relations');

[Gary Poster (gary)]

*** Submitted:

Fix lint and tests

Tweak code so tests pass.

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

https://codereview.appspot.com/13250048/

[Gary Poster (gary)]

Please take a look.

https://codereview.appspot.com/13250048/

[Gary Poster (gary)]

*** Submitted:

Trivial spelling fix

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

https://codereview.appspot.com/13250048/

=== modified file 'app/templates/service-relations-list.handlebars'
--- app/templates/service-relations-list.handlebars	2013-09-12 06:46:14 +0000
+++ app/templates/service-relations-list.handlebars	2013-09-13 21:11:02 +0000
@@ -2,7 +2,7 @@
   <h3>{{far.service}}</h3>
   <h4>Interface: {{interface}}</h4>
   <h4>Name: {{display_name}}</h4>
-  <h4>Roll: {{near.role}}</h4>
+  <h4>Role: {{near.role}}</h4>
   <h4>Scope: {{scope}}</h4>
   <div><!--unit list--></div>
 {{/relations}}