Merge lp:~rharding/juju-gui/release-quick-deploy into lp:juju-gui/experimental

[Richard Harding]

Remove "deploy from quicksearch" feature flag.

https://codereview.appspot.com/21480044/

[Richard Harding (rharding)]

Reviewers: mp+193816_code.launchpad.net,

Message:
Please take a look.

Description:
Remove "deploy from quicksearch" feature flag.

https://code.launchpad.net/~rharding/juju-gui/release-quick-deploy/+merge/193816

(do not edit description out of merge proposal)

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

Affected files (+2, -8 lines):
   A [revision details]
   M app/templates/bundle-token.handlebars
   M app/templates/charm-token.handlebars
   M test/test_browser_search_widget.js
   M test/test_token.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_browser_search_widget.js
=== modified file 'test/test_browser_search_widget.js'
--- test/test_browser_search_widget.js 2013-10-29 18:16:16 +0000
+++ test/test_browser_search_widget.js 2013-11-04 16:40:41 +0000
@@ -328,7 +328,6 @@
    });

    it('fires deploy event when the deploy button is selected',
function(done) {
- window.flags.searchDeploy = true;
      // This is heading into the private, non-publicized events of the AC
      // widget in an effort to hit the html on render after results come
      // back.
@@ -343,7 +342,6 @@
        assert.equal(ev.entityType, 'charm');
        assert.equal(ev.id, 'precise/apache2-passenger-3');
        assert.equal(ev.data.url, 'cs:precise/apache2-passenger-3');
- window.flags = {};
        done();
      });

Index: test/test_token.js
=== modified file 'test/test_token.js'
--- test/test_token.js 2013-10-29 18:16:16 +0000
+++ test/test_token.js 2013-11-04 16:40:41 +0000
@@ -247,7 +247,6 @@
    });

    it('renders the deployer button when asked to', function() {
- window.flags.searchDeploy = true;
      var token = new Token({
        size: 'tiny',
        storeId: 'test',
@@ -266,7 +265,6 @@
      var button = token_container.one('.deployButton');
      var sprite = button.one('i');
      assert.equal(sprite.getAttribute('data-charmid'), 'test');
- window.flags = {};
    });

  });

Index: app/templates/bundle-token.handlebars
=== modified file 'app/templates/bundle-token.handlebars'
--- app/templates/bundle-token.handlebars 2013-10-31 19:01:36 +0000
+++ app/templates/bundle-token.handlebars 2013-11-04 16:40:41 +0000
@@ -2,11 +2,9 @@
      test/test_charm_running.py. If you change this name, change the other
      one too! }}
  {{#if deployButton}}
- {{#ifFlag 'searchDeploy'}}
      <a class="deployButton bundle" href="">
          <i class="sprite search_add_to_canvas" data-bundleid="{{id}}"
title="Deploy bundle"></i>
      </a>
- {{/ifFlag}}
  {{/if}}
  <a href="/bundle/{{id}}"
     class="token {{size}}"

Index: app/templates/charm-token.handlebars
=== modified file 'app/templates/charm-token.handlebars'
--- app/templates/charm-token.handlebars 2013-10-30 13:23:16 +0000
+++ app/templates/charm-token.handlebars 2013-11-04 16:40:41 +0000
@@ -3,11 +3,9 @@
      one too! }}

  {{#if deployButton}}
- {{#ifFla...

[Richard Harding (rharding)]

LGTM self-reviewing trivial 8-line removal of flag.

The delay works the same if using the quick search or the normal deploy
button. The cache issues are bigger and file a new bug #1247893 about
them.

https://codereview.appspot.com/21480044/

[Richard Harding (rharding)]

*** Submitted:

Remove "deploy from quicksearch" feature flag.

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

https://codereview.appspot.com/21480044/

=== modified file 'app/templates/bundle-token.handlebars'
--- app/templates/bundle-token.handlebars	2013-10-31 19:01:36 +0000
+++ app/templates/bundle-token.handlebars	2013-11-04 16:50:34 +0000
@@ -2,11 +2,9 @@
     test/test_charm_running.py.  If you change this name, change the other
     one too! }}
 {{#if deployButton}}
-    {{#ifFlag 'searchDeploy'}}
     <a class="deployButton bundle" href="">
         <i class="sprite search_add_to_canvas" data-bundleid="{{id}}" title="Deploy bundle"></i>
     </a>
-    {{/ifFlag}}
 {{/if}}
 <a href="/bundle/{{id}}"
    class="token {{size}}"

=== modified file 'app/templates/charm-token.handlebars'
--- app/templates/charm-token.handlebars	2013-10-30 13:23:16 +0000
+++ app/templates/charm-token.handlebars	2013-11-04 16:50:34 +0000
@@ -3,11 +3,9 @@
     one too! }}
 
 {{#if deployButton}}
-    {{#ifFlag 'searchDeploy'}}
     <a class="deployButton" href="">
         <i class="sprite search_add_to_canvas" data-charmid="{{storeId}}" title="Deploy service"></i>
     </a>
-    {{/ifFlag}}
 {{/if}}
 <a href="/{{storeId}}"
    class="token {{size}}"

=== modified file 'test/test_browser_search_widget.js'
--- test/test_browser_search_widget.js	2013-10-29 18:16:16 +0000
+++ test/test_browser_search_widget.js	2013-11-04 16:50:34 +0000
@@ -328,7 +328,6 @@
   });
 
   it('fires deploy event when the deploy button is selected', function(done) {
-    window.flags.searchDeploy = true;
     // This is heading into the private, non-publicized events of the AC
     // widget in an effort to hit the html on render after results come
     // back.
@@ -343,7 +342,6 @@
       assert.equal(ev.entityType, 'charm');
       assert.equal(ev.id, 'precise/apache2-passenger-3');
       assert.equal(ev.data.url, 'cs:precise/apache2-passenger-3');
-      window.flags = {};
       done();
     });
 

=== modified file 'test/test_token.js'
--- test/test_token.js	2013-10-29 18:16:16 +0000
+++ test/test_token.js	2013-11-04 16:50:34 +0000
@@ -247,7 +247,6 @@
   });
 
   it('renders the deployer button when asked to', function() {
-    window.flags.searchDeploy = true;
     var token = new Token({
       size: 'tiny',
       storeId: 'test',
@@ -266,7 +265,6 @@
     var button = token_container.one('.deployButton');
     var sprite = button.one('i');
     assert.equal(sprite.getAttribute('data-charmid'), 'test');
-    window.flags = {};
   });
 
 });