| [vhffs-dev] [1235] SUSPENDED_BEFORE_DELETED -> SUSPEND_PENDING |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1235
Author: gradator
Date: 2008-07-20 19:36:07 +0200 (Sun, 20 Jul 2008)
Log Message:
-----------
SUSPENDED_BEFORE_DELETED -> SUSPEND_PENDING
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/Constants.pm
trunk/vhffs-api/src/Vhffs/Functions.pm
trunk/vhffs-api/src/Vhffs/Panel/Object.pm
trunk/vhffs-panel/admin/object/edit.pl
trunk/vhffs-panel/templates/admin/object/edit.tmpl
trunk/vhffs-panel/templates/admin/object/editembedded.tmpl
Modified: trunk/vhffs-api/src/Vhffs/Constants.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Constants.pm 2008-06-27 07:08:52 UTC (rev 1234)
+++ trunk/vhffs-api/src/Vhffs/Constants.pm 2008-07-20 17:36:07 UTC (rev 1235)
@@ -15,8 +15,8 @@
CREATING_ERROR => 4,
CREATED => 5,
ACTIVATED => 6,
- SUSPENDED => 7,
- SUSPENDED_BEFORE_DELETED => 8,
+ SUSPEND_PENDING => 7,
+ SUSPENDED => 8,
WAITING_FOR_MODIFICATION => 9,
MODIFICATION_ERROR => 10,
MODIFICATION_APPLIED => 11,
@@ -111,10 +111,10 @@
=head2 ACTIVATED
+=head2 SUSPEND_PENDING
+
=head2 SUSPENDED
-=head2 SUSPENDED_BEFORE_DELETED
-
=head2 WAITING_FOR_MODIFICATION
=head2 MODIFICATION_ERROR
Modified: trunk/vhffs-api/src/Vhffs/Functions.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Functions.pm 2008-06-27 07:08:52 UTC (rev 1234)
+++ trunk/vhffs-api/src/Vhffs/Functions.pm 2008-07-20 17:36:07 UTC (rev 1235)
@@ -63,8 +63,8 @@
$STATUS_STRINGS[Vhffs::Constants::CREATING_ERROR] = 'Creation error';
$STATUS_STRINGS[Vhffs::Constants::CREATED] = 'Created';
$STATUS_STRINGS[Vhffs::Constants::ACTIVATED] = 'Activated';
+$STATUS_STRINGS[Vhffs::Constants::SUSPEND_PENDING] = 'Waiting for suspension';
$STATUS_STRINGS[Vhffs::Constants::SUSPENDED] = 'Suspended';
-$STATUS_STRINGS[Vhffs::Constants::SUSPENDED_BEFORE_DELETED] = 'Suspended before deletion';
$STATUS_STRINGS[Vhffs::Constants::WAITING_FOR_MODIFICATION] = 'Waiting for modification';
$STATUS_STRINGS[Vhffs::Constants::MODIFICATION_ERROR] = 'Modification error';
$STATUS_STRINGS[Vhffs::Constants::MODIFICATION_APPLIED] = 'Modification applied';
Modified: trunk/vhffs-api/src/Vhffs/Panel/Object.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Object.pm 2008-06-27 07:08:52 UTC (rev 1234)
+++ trunk/vhffs-api/src/Vhffs/Panel/Object.pm 2008-07-20 17:36:07 UTC (rev 1235)
@@ -124,8 +124,8 @@
$template->param( TEXT_STATUS_CREATING_ERROR => gettext("Creating error") );
$template->param( TEXT_STATUS_ACTIVATED => gettext("Activated") );
$template->param( TEXT_STATUS_CREATED => gettext("Created") );
+ $template->param( TEXT_STATUS_SUSPEND_PENDING => gettext("Waiting for suspension") );
$template->param( TEXT_STATUS_SUSPENDED => gettext("Suspended") );
- $template->param( TEXT_STATUS_SUSPENDED_BEFORE_DELETED => gettext("Suspended") );
$template->param( TEXT_STATUS_WAITING_FOR_MODIFICATION => gettext("Waiting for modification") );
$template->param( TEXT_STATUS_MODIFICATION_ERROR => gettext("Modification error") );
$template->param( TEXT_STATUS_MODIFICATION_APPLIED => gettext("Modification applied") );
@@ -137,8 +137,8 @@
$template->param( VALUE_STATUS_CREATING_ERROR => Vhffs::Constants::CREATING_ERROR );
$template->param( VALUE_STATUS_ACTIVATED => Vhffs::Constants::ACTIVATED );
$template->param( VALUE_STATUS_CREATED => Vhffs::Constants::CREATED );
+ $template->param( VALUE_STATUS_SUSPEND_PENDING => Vhffs::Constants::SUSPEND_PENDING );
$template->param( VALUE_STATUS_SUSPENDED => Vhffs::Constants::SUSPENDED );
- $template->param( VALUE_STATUS_SUSPENDED_BEFORE_DELETED => Vhffs::Constants::SUSPENDED_BEFORE_DELETED );
$template->param( VALUE_STATUS_WAITING_FOR_MODIFICATION => Vhffs::Constants::WAITING_FOR_MODIFICATION );
$template->param( VALUE_STATUS_MODIFICATION_ERROR => Vhffs::Constants::MODIFICATION_ERROR );
$template->param( VALUE_STATUS_MODIFICATION_APPLIED => Vhffs::Constants::MODIFICATION_APPLIED );
@@ -170,14 +170,14 @@
{
$template->param( SELECTED_STATUS_ACTIVATED => "selected" );
}
+ elsif( $status == Vhffs::Constants::SUSPEND_PENDING )
+ {
+ $template->param( SELECTED_STATUS_SUSPEND_PENDING => "selected" );
+ }
elsif( $status == Vhffs::Constants::SUSPENDED )
{
$template->param( SELECTED_STATUS_SUSPENDED => "selected" );
}
- elsif( $status == Vhffs::Constants::SUSPENDED_BEFORE_DELETED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED_BEFORE_DELETED => "selected" );
- }
elsif( $status == Vhffs::Constants::WAITING_FOR_MODIFICATION )
{
$template->param( SELECTED_STATUS_WAITING_FOR_MODIFICATION => "selected" );
Modified: trunk/vhffs-panel/admin/object/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/object/edit.pl 2008-06-27 07:08:52 UTC (rev 1234)
+++ trunk/vhffs-panel/admin/object/edit.pl 2008-07-20 17:36:07 UTC (rev 1235)
@@ -119,8 +119,8 @@
$template->param( TEXT_STATUS_CREATING_ERROR => gettext("Creating error") );
$template->param( TEXT_STATUS_ACTIVATED => gettext("Activated") );
$template->param( TEXT_STATUS_CREATED => gettext("Created") );
+ $template->param( TEXT_STATUS_SUSPEND_PENDING => gettext("Waiting for suspension") );
$template->param( TEXT_STATUS_SUSPENDED => gettext("Suspended") );
- $template->param( TEXT_STATUS_SUSPENDED_BEFORE_DELETED => gettext("Suspended") );
$template->param( TEXT_STATUS_WAITING_FOR_MODIFICATION => gettext("Waiting for modification") );
$template->param( TEXT_STATUS_MODIFICATION_ERROR => gettext("Modification error") );
$template->param( TEXT_STATUS_MODIFICATION_APPLIED => gettext("Modification applied") );
@@ -133,8 +133,8 @@
$template->param( VALUE_STATUS_CREATING_ERROR => Vhffs::Constants::CREATING_ERROR );
$template->param( VALUE_STATUS_ACTIVATED => Vhffs::Constants::ACTIVATED );
$template->param( VALUE_STATUS_CREATED => Vhffs::Constants::CREATED );
+ $template->param( VALUE_STATUS_SUSPEND_PENDING => Vhffs::Constants::SUSPEND_PENDING );
$template->param( VALUE_STATUS_SUSPENDED => Vhffs::Constants::SUSPENDED );
- $template->param( VALUE_STATUS_SUSPENDED_BEFORE_DELETED => Vhffs::Constants::SUSPENDED_BEFORE_DELETED );
$template->param( VALUE_STATUS_WAITING_FOR_MODIFICATION => Vhffs::Constants::WAITING_FOR_MODIFICATION );
$template->param( VALUE_STATUS_MODIFICATION_ERROR => Vhffs::Constants::MODIFICATION_ERROR );
$template->param( VALUE_STATUS_MODIFICATION_APPLIED => Vhffs::Constants::MODIFICATION_APPLIED );
@@ -166,14 +166,14 @@
{
$template->param( SELECTED_STATUS_ACTIVATED => "selected" );
}
+ elsif( $status == Vhffs::Constants::SUSPEND_PENDING )
+ {
+ $template->param( SELECTED_STATUS_SUSPEND_PENDING => "selected" );
+ }
elsif( $status == Vhffs::Constants::SUSPENDED )
{
$template->param( SELECTED_STATUS_SUSPENDED => "selected" );
}
- elsif( $status == Vhffs::Constants::SUSPENDED_BEFORE_DELETED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED_BEFORE_DELETED => "selected" );
- }
elsif( $status == Vhffs::Constants::WAITING_FOR_MODIFICATION )
{
$template->param( SELECTED_STATUS_WAITING_FOR_MODIFICATION => "selected" );
Modified: trunk/vhffs-panel/templates/admin/object/edit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/object/edit.tmpl 2008-06-27 07:08:52 UTC (rev 1234)
+++ trunk/vhffs-panel/templates/admin/object/edit.tmpl 2008-07-20 17:36:07 UTC (rev 1235)
@@ -32,8 +32,8 @@
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_CREATING_ERROR"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_CREATED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_CREATED"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_ACTIVATED"></option>
+ <option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_SUSPEND_PENDING">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_SUSPEND_PENDING">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_SUSPEND_PENDING"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_SUSPENDED"></option>
- <option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
Modified: trunk/vhffs-panel/templates/admin/object/editembedded.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/object/editembedded.tmpl 2008-06-27 07:08:52 UTC (rev 1234)
+++ trunk/vhffs-panel/templates/admin/object/editembedded.tmpl 2008-07-20 17:36:07 UTC (rev 1235)
@@ -32,8 +32,8 @@
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_CREATING_ERROR"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_CREATED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_CREATED"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_ACTIVATED"></option>
+ <option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_SUSPEND_PENDING">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_SUSPEND_PENDING">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_SUSPEND_PENDING"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_SUSPENDED"></option>
- <option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>