NOTE: You will need to recreate your database for this patch
to work.
* Minor css cleanup for incorrect image path
---
src/app/controllers/image_descriptor_controller.rb | 2 +-
src/app/models/image_descriptor_target.rb | 1 +
src/config/image_descriptor_targets.yml | 14 +++++++-------
...100527095428_create_image_descriptor_targets.rb | 2 +-
src/public/stylesheets/components.css | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/app/controllers/image_descriptor_controller.rb
b/src/app/controllers/image_descriptor_controller.rb
index 11daa9c..e5a3a2d 100644
--- a/src/app/controllers/image_descriptor_controller.rb
+++ b/src/app/controllers/image_descriptor_controller.rb
@@ -21,7 +21,7 @@ class ImageDescriptorController < ApplicationController
@tab = 'summary'
if params[:targets]
params[:targets].each do |target|
- ImageDescriptorTarget.new_if_not_exists(:name => target,
:image_descriptor_id => params[:image_descriptor][:id], :status =>
ImageDescriptorTarget::STATE_WAITING)
+ ImageDescriptorTarget.new_if_not_exists(:name => target,
:image_descriptor_id => params[:image_descriptor][:id], :status =>
ImageDescriptorTarget::STATE_QUEUED)
end
end
end
diff --git a/src/app/models/image_descriptor_target.rb
b/src/app/models/image_descriptor_target.rb
index 4fceb0b..33437f1 100644
--- a/src/app/models/image_descriptor_target.rb
+++ b/src/app/models/image_descriptor_target.rb
@@ -6,6 +6,7 @@ class ImageDescriptorTarget < ActiveRecord::Base
#TODO: validations
validates_presence_of :name
+ STATE_QUEUED = 'queued'
STATE_WAITING = 'waiting'
STATE_BUILDING = 'building'
STATE_COMPLETE = 'complete'
diff --git a/src/config/image_descriptor_targets.yml
b/src/config/image_descriptor_targets.yml
index 16e9f56..669ea53 100644
--- a/src/config/image_descriptor_targets.yml
+++ b/src/config/image_descriptor_targets.yml
@@ -1,14 +1,14 @@
+rhevm:
+ name: RHEV-M
+
ec2:
name: Amazon EC2
rackspace:
name: RackSpace
-rhevm:
- name: RHEV-M
-
-gogrid:
- name: GoGrid
+#gogrid:
+# name: GoGrid
-vmware_esx:
- name: VMWare ESX
+#vmware_esx:
+# name: VMWare ESX
diff --git a/src/db/migrate/20100527095428_create_image_descriptor_targets.rb
b/src/db/migrate/20100527095428_create_image_descriptor_targets.rb
index 2cb49da..b760b90 100644
--- a/src/db/migrate/20100527095428_create_image_descriptor_targets.rb
+++ b/src/db/migrate/20100527095428_create_image_descriptor_targets.rb
@@ -2,7 +2,7 @@ class CreateImageDescriptorTargets < ActiveRecord::Migration
def self.up
create_table :image_descriptor_targets do |t|
t.string :name, :null => false
- t.integer :build_id
+ t.string :build_id
t.string :status
t.integer :image_descriptor_id
t.timestamps
diff --git a/src/public/stylesheets/components.css
b/src/public/stylesheets/components.css
index 2bfbdde..cbc0b23 100644
--- a/src/public/stylesheets/components.css
+++ b/src/public/stylesheets/components.css
@@ -376,7 +376,7 @@ ul.nav li.selected {
/* mfojtik's hacks ;-) */
#image_descriptor_nav h2 {
- background : url('/images/h2_grad.png') repeat-x;
+ background : url('../images/h2_grad.png') repeat-x;
height : 29px;
font-weight : normal;
padding : 10px 10px 0px 10px;
--
1.6.2.5
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
