Return-Path: Delivered-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Received: (qmail 8473 invoked from network); 15 Nov 2010 12:47:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Nov 2010 12:47:12 -0000 Received: (qmail 50578 invoked by uid 500); 15 Nov 2010 12:47:44 -0000 Delivered-To: apmail-incubator-deltacloud-dev-archive@incubator.apache.org Received: (qmail 50556 invoked by uid 500); 15 Nov 2010 12:47:44 -0000 Mailing-List: contact deltacloud-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltacloud-dev@incubator.apache.org Delivered-To: mailing list deltacloud-dev@incubator.apache.org Received: (qmail 50548 invoked by uid 99); 15 Nov 2010 12:47:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Nov 2010 12:47:44 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=10.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of mfojtik@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Nov 2010 12:47:36 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAFClF4k024664 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Nov 2010 07:47:15 -0500 Received: from patashnik.brq.redhat.com (dhcp-2-138.brq.redhat.com [10.34.2.138]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oAFCkvtl007166 for ; Mon, 15 Nov 2010 07:47:14 -0500 From: mfojtik@redhat.com To: deltacloud-dev@incubator.apache.org Subject: [PATCH core 11/14] Added state to Key (AVAILABLE or DELETED) Date: Mon, 15 Nov 2010 13:46:53 +0100 Message-Id: <1289825216-10939-12-git-send-email-mfojtik@redhat.com> In-Reply-To: <1289825216-10939-1-git-send-email-mfojtik@redhat.com> References: <1289825216-10939-1-git-send-email-mfojtik@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Virus-Checked: Checked by ClamAV on apache.org From: Michal Fojtik --- server/lib/deltacloud/models/key.rb | 1 + server/views/keys/show.xml.haml | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/lib/deltacloud/models/key.rb b/server/lib/deltacloud/models/key.rb index 22a69a6..d1e434e 100644 --- a/server/lib/deltacloud/models/key.rb +++ b/server/lib/deltacloud/models/key.rb @@ -23,6 +23,7 @@ class Key < BaseModel attr_accessor :username attr_accessor :password attr_accessor :pem_rsa_key + attr_accessor :state def is_password? true if @credential_type.eql?(:password) diff --git a/server/views/keys/show.xml.haml b/server/views/keys/show.xml.haml index b3659b0..abb513b 100644 --- a/server/views/keys/show.xml.haml +++ b/server/views/keys/show.xml.haml @@ -17,3 +17,5 @@ %password< =cdata do =@key.password + %state< + =@key.state -- 1.7.3.2