Index: kernel/classes/datatypes/ezobjectrelationlist/ezobjectrelationlisttype.php =================================================================== --- kernel/classes/datatypes/ezobjectrelationlist/ezobjectrelationlisttype.php (revision 22760) +++ kernel/classes/datatypes/ezobjectrelationlist/ezobjectrelationlisttype.php (working copy) @@ -468,8 +468,8 @@ $nodeAssignment = eZNodeAssignment::create( array( 'contentobject_id' => $object->attribute( 'id' ), 'contentobject_version' => $object->attribute( 'current_version' ), 'parent_node' => $relationItem['parent_node_id'], - 'sort_field' => 2, - 'sort_order' => 0, + 'sort_field' => eZContentObjectTreeNode::SORT_FIELD_PUBLISHED, + 'sort_order' => eZContentObjectTreeNode::SORT_ORDER_DESC, 'is_main' => 1 ) ); $nodeAssignment->store(); } @@ -485,8 +485,8 @@ $nodeAssignment = eZNodeAssignment::create( array( 'contentobject_id' => $object->attribute( 'id' ), 'contentobject_version' => $object->attribute( 'current_version' ), 'parent_node' => $contentObject->attribute( 'main_node_id' ), - 'sort_field' => 2, - 'sort_order' => 0, + 'sort_field' => eZContentObjectTreeNode::SORT_FIELD_PUBLISHED, + 'sort_order' => eZContentObjectTreeNode::SORT_ORDER_DESC, 'is_main' => 1 ) ); $nodeAssignment->store(); } Index: kernel/classes/ezcontentclass.php =================================================================== --- kernel/classes/ezcontentclass.php (revision 22760) +++ kernel/classes/ezcontentclass.php (working copy) @@ -137,11 +137,11 @@ 'multiplicity' => '1..*' ), 'sort_field' => array( 'name' => 'SortField', 'datatype' => 'integer', - 'default' => 1, + 'default' => eZContentObjectTreeNode::SORT_FIELD_PUBLISHED, 'required' => true ), 'sort_order' => array( 'name' => 'SortOrder', 'datatype' => 'integer', - 'default' => 1, + 'default' => eZContentObjectTreeNode::SORT_ORDER_ASC, 'required' => true ) ), "keys" => array( "id", "version" ), "function_attributes" => array( "data_map" => "dataMap", Index: kernel/classes/ezcontentobject.php =================================================================== --- kernel/classes/ezcontentobject.php (revision 22760) +++ kernel/classes/ezcontentobject.php (working copy) @@ -3401,11 +3401,13 @@ \param $parentNodeID The node ID of the parent node \param $isMain \c true if the created node is the main node of the object \param $remoteID A string denoting the unique remote ID of the assignment or \c false for no remote id. - \note The return assignment will already be stored in the database + \param $sortField + \param $sortOrder + \note The returned assignment will already be stored in the database \note Transaction unsafe. If you call several transaction unsafe methods you must enclose the calls within a db transaction; thus within db->begin and db->commit. */ - function createNodeAssignment( $parentNodeID, $isMain, $remoteID = false, $sortField = 2 /* published */, $sortOrder = 0 /* desc */ ) + function createNodeAssignment( $parentNodeID, $isMain, $remoteID = false, $sortField = eZContentObjectTreeNode::SORT_FIELD_PUBLISHED, $sortOrder = eZContentObjectTreeNode::SORT_ORDER_DESC ) { $nodeAssignment = eZNodeAssignment::create( array( 'contentobject_id' => $this->attribute( 'id' ), 'contentobject_version' => $this->attribute( 'current_version' ), Index: kernel/classes/ezcontentobjecttreenode.php =================================================================== --- kernel/classes/ezcontentobjecttreenode.php (revision 22760) +++ kernel/classes/ezcontentobjecttreenode.php (working copy) @@ -63,6 +63,20 @@ class eZContentObjectTreeNode extends eZPersistentObject { + const SORT_FIELD_PATH = 1; + const SORT_FIELD_PUBLISHED = 2; + const SORT_FIELD_MODIFIED = 3; + const SORT_FIELD_SECTION = 4; + const SORT_FIELD_DEPTH = 5; + const SORT_FIELD_CLASS_IDENTIFIER = 6; + const SORT_FIELD_CLASS_NAME = 7; + const SORT_FIELD_PRIORITY = 8; + const SORT_FIELD_NAME = 9; + const SORT_FIELD_MODIFIED_SUBNODE = 10; + + const SORT_ORDER_DESC = 0; + const SORT_ORDER_ASC = 1; + /*! Constructor */ @@ -112,11 +126,11 @@ 'required' => true ), 'sort_field' => array( 'name' => 'SortField', 'datatype' => 'integer', - 'default' => 1, + 'default' => self::SORT_FIELD_PATH, 'required' => true ), 'sort_order' => array( 'name' => 'SortOrder', 'datatype' => 'integer', - 'default' => 1, + 'default' => self::SORT_ORDER_ASC, 'required' => true ), 'priority' => array( 'name' => 'Priority', 'datatype' => 'integer', @@ -2540,68 +2554,68 @@ } /*! - \return the field name for the sort order number \a $sortOrder. - Gives a warning if the number is unknown and return \c 'path'. + \return the sort field name for the numeric sort field ID \a $sortFieldID. + Gives a warning if the ID is unknown and returns \c 'path'. */ - static function sortFieldName( $sortOrder ) + static function sortFieldName( $sortFieldID ) { - switch ( $sortOrder ) + switch ( $sortFieldID ) { default: - eZDebug::writeWarning( 'Unknown sort order: ' . $sortOrder, 'eZContentObjectTreeNode::sortFieldName' ); - case 1: + eZDebug::writeWarning( 'Unknown sort field ID: ' . $sortFieldID, __METHOD__ ); + case self::SORT_FIELD_PATH: return 'path'; - case 2: + case self::SORT_FIELD_PUBLISHED: return 'published'; - case 3: + case self::SORT_FIELD_MODIFIED: return 'modified'; - case 4: + case self::SORT_FIELD_SECTION: return 'section'; - case 5: + case self::SORT_FIELD_DEPTH: return 'depth'; - case 6: + case self::SORT_FIELD_CLASS_IDENTIFIER: return 'class_identifier'; - case 7: + case self::SORT_FIELD_CLASS_NAME: return 'class_name'; - case 8: + case self::SORT_FIELD_PRIORITY: return 'priority'; - case 9: + case self::SORT_FIELD_NAME: return 'name'; - case 10: + case self::SORT_FIELD_MODIFIED_SUBNODE: return 'modified_subnode'; } } /*! - \return the field name for the sort order number \a $sortOrder. - Gives a warning if the number is unknown and return \c 'path'. + \return the numeric sort field ID for the sort field name \a $sortFieldName. + Gives a warning if the name is unknown and returns self::SORT_FIELD_PATH. */ static function sortFieldID( $sortFieldName ) { switch ( $sortFieldName ) { default: - eZDebug::writeWarning( 'Unknown sort order: ' . $sortFieldName, 'eZContentObjectTreeNode::sortFieldID()' ); + eZDebug::writeWarning( 'Unknown sort field name: ' . $sortFieldName, __METHOD__ ); case 'path': - return 1; + return self::SORT_FIELD_PATH; case 'published': - return 2; + return self::SORT_FIELD_PUBLISHED; case 'modified': - return 3; + return self::SORT_FIELD_MODIFIED; case 'section': - return 4; + return self::SORT_FIELD_SECTION; case 'depth': - return 5; + return self::SORT_FIELD_DEPTH; case 'class_identifier': - return 6; + return self::SORT_FIELD_CLASS_IDENTIFIER; case 'class_name': - return 7; + return self::SORT_FIELD_CLASS_NAME; case 'priority': - return 8; + return self::SORT_FIELD_PRIORITY; case 'name': - return 9; + return self::SORT_FIELD_NAME; case 'modified_subnode': - return 10; + return self::SORT_FIELD_MODIFIED_SUBNODE; } } Index: kernel/classes/ezcontentobjectversion.php =================================================================== --- kernel/classes/ezcontentobjectversion.php (revision 22760) +++ kernel/classes/ezcontentobjectversion.php (working copy) @@ -739,8 +739,7 @@ return eZNodeAssignment::fetchForObject( $this->attribute( 'contentobject_id' ), $this->attribute( 'version' ) ); } - function assignToNode( $nodeID, $main = 0, $fromNodeID = 0, $sortField = null, $sortOrder = null, - $remoteID = 0 ) + function assignToNode( $nodeID, $main = 0, $fromNodeID = 0, $sortField = null, $sortOrder = null, $remoteID = 0 ) { if ( $fromNodeID == 0 && ( $this->attribute( 'status' ) == eZContentObjectVersion::STATUS_DRAFT || $this->attribute( 'status' ) == eZContentObjectVersion::STATUS_INTERNAL_DRAFT ) ) @@ -754,7 +753,7 @@ if ( $sortField !== null ) $nodeRow['sort_field'] = $sortField; if ( $sortOrder !== null ) - $nodeRow['sort_order'] = ( $sortOrder ? 1 : 0 ); + $nodeRow['sort_order'] = ( $sortOrder ? eZContentObjectTreeNode::SORT_ORDER_ASC : eZContentObjectTreeNode::SORT_ORDER_DESC ); $nodeAssignment = eZNodeAssignment::create( $nodeRow ); $nodeAssignment->store(); Index: kernel/classes/eznodeassignment.php =================================================================== --- kernel/classes/eznodeassignment.php (revision 22760) +++ kernel/classes/eznodeassignment.php (working copy) @@ -95,11 +95,11 @@ 'multiplicity' => '1..*' ), 'sort_field' => array( 'name' => 'SortField', 'datatype' => 'integer', - 'default' => 1, + 'default' => eZContentObjectTreeNode::SORT_FIELD_PATH, 'required' => true ), 'sort_order' => array( 'name' => 'SortOrder', 'datatype' => 'integer', - 'default' => 1, + 'default' => eZContentObjectTreeNode::SORT_ORDER_ASC, 'required' => true ), 'is_main' => array( 'name' => 'Main', 'datatype' => 'integer', @@ -230,11 +230,11 @@ } if ( !isset( $parameters['sort_field'] ) ) { - $parameters['sort_field'] = 2; // Published + $parameters['sort_field'] = eZContentObjectTreeNode::SORT_FIELD_PUBLISHED; } if ( !isset( $parameters['sort_order'] ) ) { - $parameters['sort_order'] = 0; // Desc + $parameters['sort_order'] = eZContentObjectTreeNode::SORT_ORDER_DESC; } if ( !isset( $parameters['from_node_id'] ) ) {