[vhffs-dev] [2215] Harmonize object states constants, previous SUSPEND_PENDING becomes WAITING_FOR_SUSPENSION.

[subversion@xxxxxxxxxxxxx]

Revision: 2215
Author:   lau
Date:     2012-10-16 13:36:13 +0200 (Tue, 16 Oct 2012)
Log Message:
-----------
Harmonize object states constants, previous SUSPEND_PENDING becomes WAITING_FOR_SUSPENSION.

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Constants.pm
    trunk/vhffs-api/src/Vhffs/Object.pm
    trunk/vhffs-api/src/Vhffs/Panel.pm
    trunk/vhffs-panel/templates/admin/object/edit.tt

Modified: trunk/vhffs-api/src/Vhffs/Constants.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Constants.pm	2012-10-14 19:46:47 UTC (rev 2214)
+++ trunk/vhffs-api/src/Vhffs/Constants.pm	2012-10-16 11:36:13 UTC (rev 2215)
@@ -28,7 +28,7 @@
 	WAITING_FOR_CREATION => 3,
 	CREATION_ERROR => 4,
 	ACTIVATED => 6,
-	SUSPEND_PENDING => 7,
+	WAITING_FOR_SUSPENSION => 7,
 	SUSPENDED => 8,
 	WAITING_FOR_MODIFICATION => 9,
 	MODIFICATION_ERROR => 10,
@@ -98,7 +98,7 @@
 		Vhffs::Constants::WAITING_FOR_CREATION => 'Waiting for creation',
 		Vhffs::Constants::CREATION_ERROR => 'Creation error',
 		Vhffs::Constants::ACTIVATED => 'Activated',
-		Vhffs::Constants::SUSPEND_PENDING => 'Waiting for suspension',
+		Vhffs::Constants::WAITING_FOR_SUSPENSION => 'Waiting for suspension',
 		Vhffs::Constants::SUSPENDED => 'Suspended',
 		Vhffs::Constants::WAITING_FOR_MODIFICATION => 'Waiting for modification',
 		Vhffs::Constants::MODIFICATION_ERROR => 'Modification error',
@@ -200,7 +200,7 @@
 =head2 WAITING_FOR_CREATION
 =head2 CREATION_ERROR
 =head2 ACTIVATED
-=head2 SUSPEND_PENDING
+=head2 WAITING_FOR_SUSPENSION
 =head2 SUSPENDED
 =head2 WAITING_FOR_MODIFICATION
 =head2 MODIFICATION_ERROR

Modified: trunk/vhffs-api/src/Vhffs/Object.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Object.pm	2012-10-14 19:46:47 UTC (rev 2214)
+++ trunk/vhffs-api/src/Vhffs/Object.pm	2012-10-16 11:36:13 UTC (rev 2215)
@@ -488,7 +488,7 @@
 	elsif( $value == Vhffs::Constants::ACTIVATED ) {
 		$self->add_history( 'Is now active for production' );
 	}
-	elsif( $value == Vhffs::Constants::SUSPEND_PENDING ) {
+	elsif( $value == Vhffs::Constants::WAITING_FOR_SUSPENSION ) {
 		$self->add_history( 'Waiting for suspension' );
 	}
 	elsif( $value == Vhffs::Constants::SUSPENDED ) {

Modified: trunk/vhffs-api/src/Vhffs/Panel.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel.pm	2012-10-14 19:46:47 UTC (rev 2214)
+++ trunk/vhffs-api/src/Vhffs/Panel.pm	2012-10-16 11:36:13 UTC (rev 2215)
@@ -387,7 +387,7 @@
 				WAITING_FOR_CREATION        => Vhffs::Constants::WAITING_FOR_CREATION,
 				CREATION_ERROR              => Vhffs::Constants::CREATION_ERROR,
 				ACTIVATED                   => Vhffs::Constants::ACTIVATED,
-				SUSPEND_PENDING             => Vhffs::Constants::SUSPEND_PENDING,
+				WAITING_FOR_SUSPENSION      => Vhffs::Constants::WAITING_FOR_SUSPENSION,
 				SUSPENDED                   => Vhffs::Constants::SUSPENDED,
 				WAITING_FOR_MODIFICATION    => Vhffs::Constants::WAITING_FOR_MODIFICATION,
 				MODIFICATION_ERROR          => Vhffs::Constants::MODIFICATION_ERROR,

Modified: trunk/vhffs-panel/templates/admin/object/edit.tt
===================================================================
--- trunk/vhffs-panel/templates/admin/object/edit.tt	2012-10-14 19:46:47 UTC (rev 2214)
+++ trunk/vhffs-panel/templates/admin/object/edit.tt	2012-10-16 11:36:13 UTC (rev 2215)
@@ -30,7 +30,7 @@
 				<option value="[% constants.object_statuses.WAITING_FOR_CREATION %]"[% ' selected="selected"' IF object.get_status == constants.object_statuses.WAITING_FOR_CREATION %]>[% 'Waiting for creation' | i18n | html %]</option>
 				<option value="[% constants.object_statuses.CREATION_ERROR %]"[% ' selected="selected"' IF object.get_status == constants.object_statuses.CREATION_ERROR %]>[% 'Error while creating object' | i18n | html %]</option>
 				<option value="[% constants.object_statuses.ACTIVATED %]"[% ' selected="selected"' IF object.get_status == constants.object_statuses.ACTIVATED %]>[% 'Activated' | i18n | html %]</option>
-				<option value="[% constants.object_statuses.SUSPEND_PENDING %]"[% ' selected="selected"' IF object.get_status == constants.object_statuses.SUSPEND_PENDING %]>[% 'Waiting for suspension' | i18n | html %]</option>
+				<option value="[% constants.object_statuses.WAITING_FOR_SUSPENSION %]"[% ' selected="selected"' IF object.get_status == constants.object_statuses.WAITING_FOR_SUSPENSION %]>[% 'Waiting for suspension' | i18n | html %]</option>
 				<option value="[% constants.object_statuses.SUSPENDED %]"[% ' selected="selected"' IF object.get_status == constants.object_statuses.SUSPENDED %]>[% 'Suspended' | i18n | html %]</option>
 				<option value="[% constants.object_statuses.WAITING_FOR_MODIFICATION %]"[% ' selected="selected"' IF object.get_status == constants.object_statuses.WAITING_FOR_MODIFICATION %]>[% 'Waiting for modification' | i18n | html %]</option>
 				<option value="[% constants.object_statuses.MODIFICATION_ERROR %]"[% ' selected="selected"' IF object.get_status == constants.object_statuses.MODIFICATION_ERROR %]>[% 'Error while modifying object' | i18n | html %]</option>