From a007cf2495834b35cf0ff5591ba6d214749c6b91 Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 19 Oct 2010 17:36:17 -0700 Subject: [PATCH 1/3] In deletepool, we set the uuid to null. However, in the db, we had a not null constraint on uuid, because of which deletepool would not work. Removing the same constaint. --- setup/db/create-schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index e83a29a4da7..b45ef5b9412 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -929,7 +929,7 @@ CREATE TABLE `cloud`.`load_balancer` ( CREATE TABLE `cloud`.`storage_pool` ( `id` bigint unsigned UNIQUE NOT NULL, `name` varchar(255) COMMENT 'should be NOT NULL', - `uuid` varchar(255) NOT NULL, + `uuid` varchar(255), `pool_type` varchar(32) NOT NULL, `port` int unsigned NOT NULL, `data_center_id` bigint unsigned NOT NULL, From 09f2836dd91d15297ef80de4a0effcbe76a5ef83 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 19 Oct 2010 17:37:55 -0700 Subject: [PATCH 2/3] new UI - ISO page - remove edit button, add Edit ISO link into action menu --- ui/new/jsp/iso.jsp | 5 +--- ui/new/scripts/cloud.core2.iso.js | 39 ++++++++++++++++++++------ ui/new/scripts/cloud.core2.template.js | 1 - 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/ui/new/jsp/iso.jsp b/ui/new/jsp/iso.jsp index b1133d781e9..fdc2b8362b2 100644 --- a/ui/new/jsp/iso.jsp +++ b/ui/new/jsp/iso.jsp @@ -24,10 +24,7 @@ <%=t.t("Details")%>
-
- -
-
+