[PATCH configure] BZ #783220 - change default admin email to 'root@localhost' (rev 2)
by Mo Morsi
---
recipes/aeolus/manifests/profiles/conductor.pp | 6 +++---
recipes/aeolus/manifests/profiles/default.pp | 6 +++---
recipes/aeolus/manifests/profiles/ec2.pp | 6 +++---
recipes/aeolus/manifests/profiles/mock.pp | 6 +++---
recipes/aeolus/manifests/profiles/rhevm.pp | 6 +++---
recipes/aeolus/manifests/profiles/vsphere.pp | 6 +++---
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/recipes/aeolus/manifests/profiles/conductor.pp b/recipes/aeolus/manifests/profiles/conductor.pp
index 83e0731..03bef43 100644
--- a/recipes/aeolus/manifests/profiles/conductor.pp
+++ b/recipes/aeolus/manifests/profiles/conductor.pp
@@ -15,10 +15,10 @@
class aeolus::profiles::conductor {
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root(a)localhost.localdomain',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/default.pp b/recipes/aeolus/manifests/profiles/default.pp
index c3a58cd..909f871 100644
--- a/recipes/aeolus/manifests/profiles/default.pp
+++ b/recipes/aeolus/manifests/profiles/default.pp
@@ -17,10 +17,10 @@ class aeolus::profiles::default {
aeolus::create_bucket{"aeolus":}
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root(a)localhost.localdomain',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/ec2.pp b/recipes/aeolus/manifests/profiles/ec2.pp
index 0cec35f..901bf5d 100644
--- a/recipes/aeolus/manifests/profiles/ec2.pp
+++ b/recipes/aeolus/manifests/profiles/ec2.pp
@@ -18,10 +18,10 @@ class aeolus::profiles::ec2 {
aeolus::create_bucket{"aeolus":}
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root(a)localhost.localdomain',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/mock.pp b/recipes/aeolus/manifests/profiles/mock.pp
index c96a48c..1e34c3a 100644
--- a/recipes/aeolus/manifests/profiles/mock.pp
+++ b/recipes/aeolus/manifests/profiles/mock.pp
@@ -17,10 +17,10 @@ class aeolus::profiles::mock {
aeolus::create_bucket{"aeolus":}
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root(a)localhost.localdomain',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp
index 0663a47..b7bdb40 100644
--- a/recipes/aeolus/manifests/profiles/rhevm.pp
+++ b/recipes/aeolus/manifests/profiles/rhevm.pp
@@ -52,10 +52,10 @@ class aeolus::profiles::rhevm {
aeolus::create_bucket{"aeolus":}
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root(a)localhost.localdomain',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/vsphere.pp b/recipes/aeolus/manifests/profiles/vsphere.pp
index 130a80a..3064da9 100644
--- a/recipes/aeolus/manifests/profiles/vsphere.pp
+++ b/recipes/aeolus/manifests/profiles/vsphere.pp
@@ -31,10 +31,10 @@ class aeolus::profiles::vsphere {
require => Package['aeolus-conductor-daemons'] }
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root(a)localhost.localdomain',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
--
1.7.6.5
12 years, 2 months
[PATCH 0/2] Fix dpes to push to rubygems.org
by Jason Guiditta
In building these gems today and attempting to install them on a clean
client system (via rvm), I realize we were missing deps for activeresource
on both gems. We may want to explicitly add it to the spec files too,
but that is a decision we can make later/separately, imo, as we already
get that in current rpm installs via the rails dep. Alos, for standard
conductor development via bundle install, the correct deps are already in
our .lock file, so this cover strcitly an install of these 2 gems stand-alone.
Admittedly, you would probably not be using aeolus-image standalone, but
this covers things a bit better, I think.
If you want to test that these gems install properly via rvm, simply:
* rvm install ruby-1.8.7-p352 (or 357 if you prefer)
* rvm gemset create aeolus
* rvm gemset use aeolus
* 'rake gem' for each of the 2 gems
* gem install <gemfile> (the land in pkg dir of each project, 0.4.0 for each)
I'll hold off pushing these to rubygems.org until tomorrow so somebody can
verfiy this works as expected (wfm).
Note that this is critical for upstream development, as it enables bundle install
to work correctly, especially once my in-progress bundler changes land.
-j
12 years, 2 months
[PATCH conductor] BZ750957 Redirect to pools pretty view after creating pools
by Jirka Tomasek
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
src/app/controllers/pools_controller.rb | 4 +---
src/features/pool.feature | 20 ++++----------------
src/spec/controllers/pools_controller_spec.rb | 3 +--
3 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/src/app/controllers/pools_controller.rb b/src/app/controllers/pools_controller.rb
index 3565721..37ae5a7 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -122,9 +122,7 @@ class PoolsController < ApplicationController
if @pool.save
@pool.assign_owner_roles(current_user)
flash[:notice] = t "pools.flash.notice.added"
- format.html { redirect_to :action => 'show', :id => @pool.id }
- # TODO - The new UI is almost certainly going to want a new partial for .js
- format.js { render :partial => 'show', :id => @pool.id }
+ format.html { redirect_to pools_path }
format.json { render :json => @pool, :status => :created }
else
flash.now[:warning] = t "pools.flash.warning.creation_failed"
diff --git a/src/features/pool.feature b/src/features/pool.feature
index b837dfc..14a9e7a 100644
--- a/src/features/pool.feature
+++ b/src/features/pool.feature
@@ -16,21 +16,10 @@ Feature: Manage Pools
And I select "default" from "pool_pool_family_id"
And I fill in "quota_instances" with "unlimited"
And I press "save_button"
- Then I should be on the page for the pool "mockpool"
+ Then I should be on the pools page
And I should see "mockpool"
And I should have a pool named "mockpool"
- Scenario: Create a new Pool over XHR
- Given I request XHR
- And I am on the new pool page
- Then I should get back a partial
- When I fill in "pool_name" with "mockpool"
- And I select "default" from "pool_pool_family_id"
- And I fill in "quota_instances" with "unlimited"
- And I press "save_button"
- Then I should get back a partial
- And I should see "mockpool"
-
Scenario: View Pool's Quota Usage
Given I have Pool Creator permissions on a pool named "mockpool"
And the "mockpool" Pool has a quota with following capacities:
@@ -72,18 +61,17 @@ Feature: Manage Pools
When I fill in "pool_name" with "mockpool"
And I select "default" from "pool_pool_family_id"
And I press "save_button"
- Then I should be on the page for the pool "mockpool"
+ Then I should be on the pools page
And I should see a confirmation message
And I should see "mockpool"
And I should have a pool named "mockpool"
- When I go to the pools page
- And I follow link with ID "filter_view"
+ When I follow link with ID "filter_view"
And I follow "new_pool_button"
Then I should be on the new pool page
When I fill in "pool_name" with "foopool"
And I select "default" from "pool_pool_family_id"
And I press "save_button"
- Then I should be on the page for the pool "foopool"
+ Then I should be on the pools page
And I should see a confirmation message
And I should have a pool named "mockpool"
And I should have a pool named "foopool"
diff --git a/src/spec/controllers/pools_controller_spec.rb b/src/spec/controllers/pools_controller_spec.rb
index 25770b1..21af9d0 100644
--- a/src/spec/controllers/pools_controller_spec.rb
+++ b/src/spec/controllers/pools_controller_spec.rb
@@ -46,8 +46,7 @@ describe PoolsController do
:enabled => true
}
end.should change(Pool, :count).by(1)
- id = Pool.find(:first, :conditions => ['name = ?', 'foopool']).id
- response.should redirect_to(pool_path(id))
+ response.should redirect_to(pools_path)
end
it "should allow RESTful delete of a single pool" do
--
1.7.7.6
12 years, 2 months
[PATCH conductor] BZ 782879 fixes images count in images table in deployable detail page
by Jirka Tomasek
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
src/app/models/deployable.rb | 2 +-
src/app/util/deployable_xml.rb | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/app/models/deployable.rb b/src/app/models/deployable.rb
index a90232e..c9df4c5 100644
--- a/src/app/models/deployable.rb
+++ b/src/app/models/deployable.rb
@@ -121,7 +121,7 @@ class Deployable < ActiveRecord::Base
deployable_xml.assemblies.each do |assembly|
assembly_hash ||= {:name => assembly.name}
assembly_hash[:image_uuid] = assembly.image_id
- assembly_hash[:images_count] = assembly.image.count
+ assembly_hash[:images_count] = assembly.images_count
if assembly.hwp
hwp_name = assembly.hwp
hwp = HardwareProfile.find_by_name(hwp_name)
diff --git a/src/app/util/deployable_xml.rb b/src/app/util/deployable_xml.rb
index 9ece7b5..3032b5e 100644
--- a/src/app/util/deployable_xml.rb
+++ b/src/app/util/deployable_xml.rb
@@ -108,6 +108,10 @@ class AssemblyXML
@image ||= @root.at("image")
end
+ def images_count
+ @root.xpath('./image').count
+ end
+
def image_id
@image_id ||= image['id']
end
--
1.7.7.6
12 years, 2 months
[PATCH configure] BZ #783220 - change default admin email to 'root@localhost'
by Mo Morsi
---
recipes/aeolus/manifests/profiles/conductor.pp | 6 +++---
recipes/aeolus/manifests/profiles/custom.pp | 6 +++---
recipes/aeolus/manifests/profiles/default.pp | 6 +++---
recipes/aeolus/manifests/profiles/ec2.pp | 6 +++---
recipes/aeolus/manifests/profiles/mock.pp | 6 +++---
recipes/aeolus/manifests/profiles/rhevm.pp | 6 +++---
recipes/aeolus/manifests/profiles/vsphere.pp | 6 +++---
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/recipes/aeolus/manifests/profiles/conductor.pp b/recipes/aeolus/manifests/profiles/conductor.pp
index 83e0731..aabd98f 100644
--- a/recipes/aeolus/manifests/profiles/conductor.pp
+++ b/recipes/aeolus/manifests/profiles/conductor.pp
@@ -15,10 +15,10 @@
class aeolus::profiles::conductor {
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root@localhost',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/custom.pp b/recipes/aeolus/manifests/profiles/custom.pp
index d87c0fe..fdbe126 100644
--- a/recipes/aeolus/manifests/profiles/custom.pp
+++ b/recipes/aeolus/manifests/profiles/custom.pp
@@ -15,10 +15,10 @@
class aeolus::profiles::custom {
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root@localhost',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/default.pp b/recipes/aeolus/manifests/profiles/default.pp
index c3a58cd..8ac8ab3 100644
--- a/recipes/aeolus/manifests/profiles/default.pp
+++ b/recipes/aeolus/manifests/profiles/default.pp
@@ -17,10 +17,10 @@ class aeolus::profiles::default {
aeolus::create_bucket{"aeolus":}
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root@localhost',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/ec2.pp b/recipes/aeolus/manifests/profiles/ec2.pp
index 0cec35f..d8f408d 100644
--- a/recipes/aeolus/manifests/profiles/ec2.pp
+++ b/recipes/aeolus/manifests/profiles/ec2.pp
@@ -18,10 +18,10 @@ class aeolus::profiles::ec2 {
aeolus::create_bucket{"aeolus":}
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root@localhost',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/mock.pp b/recipes/aeolus/manifests/profiles/mock.pp
index c96a48c..a4b4b83 100644
--- a/recipes/aeolus/manifests/profiles/mock.pp
+++ b/recipes/aeolus/manifests/profiles/mock.pp
@@ -17,10 +17,10 @@ class aeolus::profiles::mock {
aeolus::create_bucket{"aeolus":}
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root@localhost',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp
index 0663a47..5322f30 100644
--- a/recipes/aeolus/manifests/profiles/rhevm.pp
+++ b/recipes/aeolus/manifests/profiles/rhevm.pp
@@ -52,10 +52,10 @@ class aeolus::profiles::rhevm {
aeolus::create_bucket{"aeolus":}
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root@localhost',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
diff --git a/recipes/aeolus/manifests/profiles/vsphere.pp b/recipes/aeolus/manifests/profiles/vsphere.pp
index 130a80a..c28e7e1 100644
--- a/recipes/aeolus/manifests/profiles/vsphere.pp
+++ b/recipes/aeolus/manifests/profiles/vsphere.pp
@@ -31,10 +31,10 @@ class aeolus::profiles::vsphere {
require => Package['aeolus-conductor-daemons'] }
aeolus::conductor::site_admin{"admin":
- email => 'dcuser(a)aeolusproject.org',
+ email => 'root@localhost',
password => "password",
- first_name => 'aeolus',
- last_name => 'user'}
+ first_name => 'Administrator',
+ last_name => ''}
aeolus::conductor::login{"admin": password => "password",
require => Aeolus::Conductor::Site_admin['admin']}
--
1.7.6.5
12 years, 2 months
[PATCH conductor] BZ785006 Clicking pool and deployment links in list view, leads to appropriate list view
by Jirka Tomasek
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
src/app/views/deployments/_list.html.haml | 8 ++++----
src/app/views/pools/_list.html.haml | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/views/deployments/_list.html.haml b/src/app/views/deployments/_list.html.haml
index d2177ac..b66f8fc 100644
--- a/src/app/views/deployments/_list.html.haml
+++ b/src/app/views/deployments/_list.html.haml
@@ -31,12 +31,12 @@
- selected = params[:select] == 'all'
= check_box_tag "deployments_selected[]", deployment.id, selected, :id => "deployment_checkbox_#{deployment.id}"
%td{:class => 'alert'}= deployment.failed_instances.present? ? image_tag("sb_icon_instance_failure.png") : ""
- %td= link_to(deployment.name, deployment)
+ %td= link_to(deployment.name, deployment_path(deployment, :view => :filter))
%td= deployment.created_at
%td= deployment.deployable_xml.name
%td= deployment.deployment_state
%td{:class => 'center'}= deployment.instances.count
- %td= link_to deployment.pool.name, pool_path(deployment.pool)
+ %td= link_to deployment.pool.name, pool_path(deployment.pool, :view => :filter)
%td= owner_name(deployment)
%td= link_to(deployment.provider.provider_type.name, deployment.provider) if deployment.provider
:javascript
@@ -55,12 +55,12 @@
#{image_tag("sb_icon_instance_failure.png")}
{{/if}}
</td>
- <td><a href="#{deployment_path('replace_id').sub('replace_id', '${id}')}">${name}</a></td>
+ <td><a href="#{deployment_path('replace_id', :view => :filter).sub('replace_id', '${id}')}">${name}</a></td>
<td>${created_at}</td>
<td>${deployable_xml_name}</td>
<td>${deployment_state}</td>
<td class="center">${instances_count}</td>
- <td><a href="#{pool_path('replace_id').sub('replace_id', '${pool.id}')}">${pool.name}</a></td>
+ <td><a href="#{pool_path('replace_id', :view => :filter).sub('replace_id', '${pool.id}')}">${pool.name}</a></td>
<td>${owner}</td>
<td>
{{if provider}}
diff --git a/src/app/views/pools/_list.html.haml b/src/app/views/pools/_list.html.haml
index adc0304..8c53d35 100644
--- a/src/app/views/pools/_list.html.haml
+++ b/src/app/views/pools/_list.html.haml
@@ -27,7 +27,7 @@
%td{:class => 'checkbox'}
%input{:name => "pools_selected[]", :type => "checkbox", :value => pool.id, :id => "pool_checkbox_#{pool.id}" }
%td{:class => 'alert'}= (@statistics[:instances_failed] & pool.instances).present? ? image_tag("sb_icon_instance_failure.png") : ""
- %td= link_to(pool.name, pool)
+ %td= link_to(pool.name, pool_path(pool, :view => :filter))
%td{:class => 'center'}= pool.deployments.count
%td{:class => 'center'}= pool.statistics[:total_instances]
%td{:class => 'center'}= pool.statistics[:instances_pending]
@@ -47,7 +47,7 @@
#{image_tag("sb_icon_instance_failure.png")}
{{/if}}
</td>
- <td><a href="#{pool_path('replace_id').sub('replace_id', '${id}')}">${name}</a></td>
+ <td><a href="#{pool_path('replace_id', :view => :filter).sub('replace_id', '${id}')}">${name}</a></td>
<td class="center">${deployments_count}</td>
<td class="center">${statistics.total_instances}</td>
<td class="center">${statistics.instances_pending}</td>
--
1.7.7.6
12 years, 2 months
[PATCH conductor] BZ#781604 Fix inconsistent Search behaviour on Enter keypress
by Tomas Sedovic
From: Tomas Sedovic <tomas(a)sedovic.cz>
https://bugzilla.redhat.com/show_bug.cgi?id=781604
If a form has more than one submit button, it's left to the implementation
which one is going to be pressed on Enter.
It should come to no surprise to anyone that IE's behaviour is different from
all the major browsers.
This adds a little JavaScript piece that makes sure the proper button is
clicked when the user presses Enter in the search fields.
---
src/app/views/catalogs/_list.html.haml | 1 +
src/app/views/catalogs/show.html.haml | 1 +
src/app/views/deployables/_list.html.haml | 1 +
src/app/views/deployments/_list.html.haml | 1 +
src/app/views/hardware_profiles/_list.html.haml | 1 +
src/app/views/instances/_list.html.haml | 1 +
src/app/views/pools/_list.html.haml | 1 +
src/app/views/provider_accounts/_list.html.haml | 1 +
src/app/views/provider_realms/_list.html.haml | 1 +
src/app/views/realms/_list.html.haml | 1 +
src/app/views/users/_list.html.haml | 1 +
src/public/javascripts/application.js | 9 +++++++++
12 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/app/views/catalogs/_list.html.haml b/src/app/views/catalogs/_list.html.haml
index bb278f8..4a8a462 100644
--- a/src/app/views/catalogs/_list.html.haml
+++ b/src/app/views/catalogs/_list.html.haml
@@ -20,6 +20,7 @@
$("#catalogs_preset_filter").change(function() {
$("#apply_catalogs_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#catalogs_search'), $('#apply_catalogs_search'));
});
= filter_table(@header, @catalogs) do |catalog|
diff --git a/src/app/views/catalogs/show.html.haml b/src/app/views/catalogs/show.html.haml
index 09e742a..b633c6d 100644
--- a/src/app/views/catalogs/show.html.haml
+++ b/src/app/views/catalogs/show.html.haml
@@ -43,6 +43,7 @@
$("#deployables_preset_filter").change(function() {
$("#apply_deployables_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#deployables_search'), $('#apply_deployables_search'));
});
= filter_table(@header, @deployables) do |deployable|
diff --git a/src/app/views/deployables/_list.html.haml b/src/app/views/deployables/_list.html.haml
index b5336ee..776be28 100644
--- a/src/app/views/deployables/_list.html.haml
+++ b/src/app/views/deployables/_list.html.haml
@@ -23,6 +23,7 @@
$("#catalog_entries_preset_filter").change(function() {
$("#apply_catalog_entries_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#catalog_entries_search'), $('#apply_catalog_entries_search'));
});
= filter_table(@header, @deployables) do |deployable|
diff --git a/src/app/views/deployments/_list.html.haml b/src/app/views/deployments/_list.html.haml
index d2177ac..b2e7109 100644
--- a/src/app/views/deployments/_list.html.haml
+++ b/src/app/views/deployments/_list.html.haml
@@ -23,6 +23,7 @@
$("#deployments_preset_filter").change(function() {
$("#apply_deployments_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#deployments_search'), $('#apply_deployments_search'));
});
= filter_table(@deployments_header, @deployments) do |deployment|
diff --git a/src/app/views/hardware_profiles/_list.html.haml b/src/app/views/hardware_profiles/_list.html.haml
index 9a84444..138fef9 100644
--- a/src/app/views/hardware_profiles/_list.html.haml
+++ b/src/app/views/hardware_profiles/_list.html.haml
@@ -20,6 +20,7 @@
$("#hardware_profiles_preset_filter").change(function() {
$("#apply_hardware_profiles_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#hardware_profiles_search'), $('#apply_hardware_profiles_search'));
});
= filter_table(hardware_profiles_header, @hardware_profiles) do |hwp|
diff --git a/src/app/views/instances/_list.html.haml b/src/app/views/instances/_list.html.haml
index f254659..e120e68 100644
--- a/src/app/views/instances/_list.html.haml
+++ b/src/app/views/instances/_list.html.haml
@@ -21,6 +21,7 @@
$("#instances_preset_filter").change(function() {
$("#apply_instances_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#instances_search'), $('#apply_instances_search'));
});
= filter_table(instances_header, @instances) do |instance|
diff --git a/src/app/views/pools/_list.html.haml b/src/app/views/pools/_list.html.haml
index adc0304..274a0b3 100644
--- a/src/app/views/pools/_list.html.haml
+++ b/src/app/views/pools/_list.html.haml
@@ -20,6 +20,7 @@
$("#pools_preset_filter").change(function() {
$("#apply_pools_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#pools_search'), $('#apply_pools_search'));
});
= filter_table(@header, @pools) do |pool|
diff --git a/src/app/views/provider_accounts/_list.html.haml b/src/app/views/provider_accounts/_list.html.haml
index 2430a04..3f4753e 100644
--- a/src/app/views/provider_accounts/_list.html.haml
+++ b/src/app/views/provider_accounts/_list.html.haml
@@ -20,6 +20,7 @@
$("#provider_accounts_preset_filter").change(function() {
$("#apply_provider_accounts_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#provider_accounts_search'), $('#apply_provider_accounts_search'));
});
= filter_table(provider_accounts_header, @provider_accounts) do |account|
diff --git a/src/app/views/provider_realms/_list.html.haml b/src/app/views/provider_realms/_list.html.haml
index b88054e..82d3732 100644
--- a/src/app/views/provider_realms/_list.html.haml
+++ b/src/app/views/provider_realms/_list.html.haml
@@ -15,6 +15,7 @@
$("#provider_realms_preset_filter").change(function() {
$("#apply_provider_realms_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#provider_realms_search'), $('#apply_provider_realms_search'));
});
= filter_table(provider_realms_header, @realms) do |realm|
diff --git a/src/app/views/realms/_list.html.haml b/src/app/views/realms/_list.html.haml
index 1ee3ee8..70d12ab 100644
--- a/src/app/views/realms/_list.html.haml
+++ b/src/app/views/realms/_list.html.haml
@@ -23,6 +23,7 @@
$("#realms_preset_filter").change(function() {
$("#apply_realms_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#realms_search'), $('#apply_realms_search'));
});
= filter_table(realms_header, @realms) do |realm|
diff --git a/src/app/views/users/_list.html.haml b/src/app/views/users/_list.html.haml
index d320e40..decfe2b 100644
--- a/src/app/views/users/_list.html.haml
+++ b/src/app/views/users/_list.html.haml
@@ -31,6 +31,7 @@
$("#users_preset_filter").change(function() {
$("#apply_users_preset_filter").click();
});
+ Conductor.clickOnEnterKeypress($('#users_search'), $('#apply_users_search'));
});
= filter_table(@header, @users) do |user|
diff --git a/src/public/javascripts/application.js b/src/public/javascripts/application.js
index a3dd4a7..6cef5c2 100644
--- a/src/public/javascripts/application.js
+++ b/src/public/javascripts/application.js
@@ -256,6 +256,15 @@ $.extend(Conductor, {
});
},
+ clickOnEnterKeypress: function($textField, $button) {
+ $textField.live('keypress', function(e) {
+ if((e.keyCode || e.which) == 13) {
+ e.preventDefault();
+ $button.click();
+ }
+ });
+ },
+
fetchAjaxDescription: function(selector_box, description_field, base_url) {
selector_box.live("change", function(e) {
var realm_id = $(e.target).val();
--
1.7.6.5
12 years, 2 months