Revision: 46038
Author: tparscal
Date: 2009-01-22 22:37:11 +0000 (Thu, 22 Jan 2009)
Log Message:
-----------
Added additional confirmation requirements to removals. Fixed some UI issues
with removal pages. Removed notes from native model rows. Added notes to all
components as meta fields.
Modified Paths:
--------------
trunk/extensions/DataCenter/Controllers/Plans.php
trunk/extensions/DataCenter/Controllers/Settings.php
trunk/extensions/DataCenter/DataCenter.db.php
trunk/extensions/DataCenter/DataCenter.i18n.php
trunk/extensions/DataCenter/DataCenter.sql
trunk/extensions/DataCenter/UI/Widgets/Table.php
trunk/extensions/DataCenter/Views/Models.php
trunk/extensions/DataCenter/Views/Plans/Object.php
trunk/extensions/DataCenter/Views/Plans/Plan.php
trunk/extensions/DataCenter/Views/Plans/Rack.php
trunk/extensions/DataCenter/Views/Settings/Field.php
Modified: trunk/extensions/DataCenter/Controllers/Plans.php
===================================================================
--- trunk/extensions/DataCenter/Controllers/Plans.php 2009-01-22 22:16:27 UTC
(rev 46037)
+++ trunk/extensions/DataCenter/Controllers/Plans.php 2009-01-22 22:37:11 UTC
(rev 46038)
@@ -92,6 +92,13 @@
array $data,
$type
) {
+ // Checks for confirmation
+ if (
+ !isset( $data['row']['confirm'] ) ||
+ ( $data['row']['confirm'] != 'yes' )
+ ) {
+ return false;
+ }
switch ( $type ) {
case 'plan':
$plan = DataCenterDBPlan::newFromValues(
$data['row'] );
Modified: trunk/extensions/DataCenter/Controllers/Settings.php
===================================================================
--- trunk/extensions/DataCenter/Controllers/Settings.php 2009-01-22
22:16:27 UTC (rev 46037)
+++ trunk/extensions/DataCenter/Controllers/Settings.php 2009-01-22
22:37:11 UTC (rev 46038)
@@ -59,6 +59,13 @@
array $data,
$type
) {
+ // Checks for confirmation
+ if (
+ !isset( $data['row']['confirm'] ) ||
+ ( $data['row']['confirm'] != 'yes' )
+ ) {
+ return false;
+ }
switch ( $type ) {
case 'field':
$field = DataCenterDBMetaField::newFromValues(
$data['row'] );
Modified: trunk/extensions/DataCenter/DataCenter.db.php
===================================================================
--- trunk/extensions/DataCenter/DataCenter.db.php 2009-01-22 22:16:27 UTC
(rev 46037)
+++ trunk/extensions/DataCenter/DataCenter.db.php 2009-01-22 22:37:11 UTC
(rev 46038)
@@ -2233,7 +2233,7 @@
}
}
-class DataCenterDBPlan extends DataCenterDBComponent {
+class DataCenterDBPlan extends DataCenterDBRow {
/* Protected Members */
Modified: trunk/extensions/DataCenter/DataCenter.i18n.php
===================================================================
--- trunk/extensions/DataCenter/DataCenter.i18n.php 2009-01-22 22:16:27 UTC
(rev 46037)
+++ trunk/extensions/DataCenter/DataCenter.i18n.php 2009-01-22 22:37:11 UTC
(rev 46038)
@@ -91,6 +91,7 @@
'datacenter-ui-error-invalid-data' => 'You have provided invalid data',
'datacenter-ui-error-no-components' => 'No components were provided',
'datacenter-ui-error-no-fields' => 'No fields were provided',
+ 'datacenter-ui-error-no-rows' => 'No records found',
'datacenter-ui-error-no-ui-widget' => 'The user-interface widget "$1"
doesn\'t exist',
// Fields
'datacenter-ui-field-name' => 'Name',
@@ -142,6 +143,7 @@
'datacenter-ui-field-tense' => 'Tense',
'datacenter-ui-field-change-summary' => 'Change Summary',
'datacenter-ui-field-uses' => 'Uses',
+ 'datacenter-ui-field-confirm' => 'Enter "yes" to confirm',
// Label
'datacenter-ui-label-reset' => 'Reset',
'datacenter-ui-label-cancel' => 'Cancel',
Modified: trunk/extensions/DataCenter/DataCenter.sql
===================================================================
--- trunk/extensions/DataCenter/DataCenter.sql 2009-01-22 22:16:27 UTC (rev
46037)
+++ trunk/extensions/DataCenter/DataCenter.sql 2009-01-22 22:37:11 UTC (rev
46038)
@@ -98,8 +98,6 @@
mdl_rak_name VARBINARY(255) NOT NULL default '',
-- Kind of this rack model
mdl_rak_kind VARBINARY(255) NOT NULL default '',
- -- Note about this rack model
- mdl_rak_note BLOB,
-- Number of vertical rack units this rack model can hold
mdl_rak_units INTEGER,
--
@@ -117,8 +115,6 @@
mdl_obj_name VARBINARY(255) NOT NULL default '',
-- Kind of this object model
mdl_obj_kind VARBINARY(255) NOT NULL default '',
- -- Note about this object model
- mdl_obj_note BLOB,
-- The form factor of this object model
mdl_obj_form_factor ENUM(
'rackunit',
@@ -507,7 +503,7 @@
)
VALUES
( 'WikiMedia Owned', 'boolean' ),
- ( 'Extra Notes', 'text' ),
+ ( 'Notes', 'text' ),
( 'Weight (LBS)', 'number' ),
( 'Assigned User', 'string' );
--
@@ -575,6 +571,9 @@
( 2, 'facility', 'space' ),
( 2, 'asset', 'rack' ),
( 2, 'asset', 'object' ),
+ ( 2, 'model', 'rack' ),
+ ( 2, 'model', 'object' ),
+ ( 2, 'model', 'port' ),
( 3, 'asset', 'object' ),
( 4, 'asset', 'object' );
--
Modified: trunk/extensions/DataCenter/UI/Widgets/Table.php
===================================================================
--- trunk/extensions/DataCenter/UI/Widgets/Table.php 2009-01-22 22:16:27 UTC
(rev 46037)
+++ trunk/extensions/DataCenter/UI/Widgets/Table.php 2009-01-22 22:37:11 UTC
(rev 46038)
@@ -101,6 +101,13 @@
DataCenterUI::message( 'field', $label )
);
}
+ if ( count( $parameters['rows'] ) == 0 ) {
+ $xmlOutput .= DataCenterXml::row(
+ DataCenterXml::cell(
+ DataCenterUI::message( 'error',
'no-rows' )
+ )
+ );
+ }
// Loops over each row
foreach ( $parameters['rows'] as $i => $row ) {
// Builds row attributes
Modified: trunk/extensions/DataCenter/Views/Models.php
===================================================================
--- trunk/extensions/DataCenter/Views/Models.php 2009-01-22 22:16:27 UTC
(rev 46037)
+++ trunk/extensions/DataCenter/Views/Models.php 2009-01-22 22:37:11 UTC
(rev 46038)
@@ -23,7 +23,6 @@
'manufacturer' => array( 'type' =>
'string' ),
'name' => array( 'type' => 'string' ),
'kind' => array( 'type' => 'string' ),
- 'note' => array( 'type' => 'text' ),
'units' => array(
'type' => 'number',
'min' => 1,
@@ -34,7 +33,7 @@
'details' => array(
'heading' => array( 'field' => 'name' ),
'fields' => array(
- 'manufacturer', 'name', 'kind',
'units', 'note'
+ 'manufacturer', 'name', 'kind', 'units'
)
),
),
@@ -51,7 +50,6 @@
'manufacturer' => array( 'type' =>
'string' ),
'name' => array( 'type' => 'string' ),
'kind' => array( 'type' => 'string' ),
- 'note' => array( 'type' => 'text' ),
'form-factor' => array(
'field' => 'form_factor',
'type' => 'list',
@@ -87,7 +85,6 @@
'units',
'depth',
'power',
- 'note'
)
),
),
@@ -103,7 +100,6 @@
'fields' => array(
'name' => array( 'type' => 'string' ),
'kind' => array( 'type' => 'string' ),
- 'note' => array( 'type' => 'text' ),
'category' => array(
'type' => 'list',
'enum' => array(
@@ -125,7 +121,7 @@
'details' => array(
'heading' => array( 'field' => 'name' ),
'fields' => array(
- 'name', 'kind', 'category', 'format',
'note'
+ 'name', 'kind', 'category', 'format'
)
),
),
Modified: trunk/extensions/DataCenter/Views/Plans/Object.php
===================================================================
--- trunk/extensions/DataCenter/Views/Plans/Object.php 2009-01-22 22:16:27 UTC
(rev 46037)
+++ trunk/extensions/DataCenter/Views/Plans/Object.php 2009-01-22 22:37:11 UTC
(rev 46038)
@@ -281,9 +281,9 @@
DataCenterUI::renderWidget(
'body',
array(
- 'message' =>
'confirm-remove-type',
- 'subject' =>
$path['type'],
- 'type' =>
'notice',
+ 'message' =>
'notice-removing-type',
+ 'type' =>
$path['type'],
+ 'style' =>
'notice',
)
),
DataCenterUI::renderWidget(
@@ -323,7 +323,9 @@
'page'
=> 'plans',
'type'
=> 'object'
),
- 'fields' =>
array()
+ 'fields' =>
array(
+
'confirm' => array( 'type' => 'string' )
+ )
)
)
)
Modified: trunk/extensions/DataCenter/Views/Plans/Plan.php
===================================================================
--- trunk/extensions/DataCenter/Views/Plans/Plan.php 2009-01-22 22:16:27 UTC
(rev 46037)
+++ trunk/extensions/DataCenter/Views/Plans/Plan.php 2009-01-22 22:37:11 UTC
(rev 46038)
@@ -220,9 +220,9 @@
DataCenterUI::renderWidget(
'body',
array(
- 'message' =>
'confirm-remove-type',
- 'subject' =>
$path['type'],
- 'type' =>
'notice',
+ 'message' =>
'notice-removing-type',
+ 'type' =>
$path['type'],
+ 'style' =>
'notice',
)
),
DataCenterUI::renderWidget(
@@ -259,7 +259,9 @@
'page'
=> 'plans',
'type'
=> 'plan'
),
- 'fields' =>
array()
+ 'fields' =>
array(
+
'confirm' => array( 'type' => 'string' )
+ )
)
),
)
Modified: trunk/extensions/DataCenter/Views/Plans/Rack.php
===================================================================
--- trunk/extensions/DataCenter/Views/Plans/Rack.php 2009-01-22 22:16:27 UTC
(rev 46037)
+++ trunk/extensions/DataCenter/Views/Plans/Rack.php 2009-01-22 22:37:11 UTC
(rev 46038)
@@ -308,9 +308,9 @@
DataCenterUI::renderWidget(
'body',
array(
- 'message' =>
'confirm-remove-type',
- 'subject' =>
$path['type'],
- 'type' =>
'notice',
+ 'message' =>
'notice-removing-type',
+ 'type' =>
$path['type'],
+ 'style' =>
'notice',
)
),
DataCenterUI::renderWidget(
@@ -350,7 +350,9 @@
'page'
=> 'plans',
'type'
=> 'rack'
),
- 'fields' =>
array()
+ 'fields' =>
array(
+
'confirm' => array( 'type' => 'string' )
+ )
)
),
)
Modified: trunk/extensions/DataCenter/Views/Settings/Field.php
===================================================================
--- trunk/extensions/DataCenter/Views/Settings/Field.php 2009-01-22
22:16:27 UTC (rev 46037)
+++ trunk/extensions/DataCenter/Views/Settings/Field.php 2009-01-22
22:37:11 UTC (rev 46038)
@@ -170,7 +170,9 @@
'page'
=> 'settings',
'type'
=> 'field'
),
- 'fields' =>
array()
+ 'fields' =>
array(
+
'confirm' => array( 'type' => 'string' )
+ )
)
)
)
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
