From bd082c0a6e3121d78df6ce98e4f3d38b8a7bfe18 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 10 Dec 2018 15:25:22 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B0917=20-=20Rolled=20back=20fields=20to=20?= =?UTF-8?q?AttributeText=20until=20AttributeQueryAttCodeSet=20can=20manage?= =?UTF-8?q?=20fields=20order=20correctly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/query.class.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/query.class.inc.php b/application/query.class.inc.php index b7ec32964..0cd40334d 100644 --- a/application/query.class.inc.php +++ b/application/query.class.inc.php @@ -77,7 +77,9 @@ class QueryOQL extends Query MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeQueryAttCodeSet("fields", array("allowed_values"=>null,"max_items" => 1000, "query_field" => "oql", "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array('oql')))); + MetaModel::Init_AddAttribute(new AttributeText("fields", array("allowed_values"=>null, "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); + // Rolled back to AttributeText until AttributeQueryAttCodeSet can manage fields order correctly + //MetaModel::Init_AddAttribute(new AttributeQueryAttCodeSet("fields", array("allowed_values"=>null,"max_items" => 1000, "query_field" => "oql", "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array('oql')))); // Display lists MetaModel::Init_SetZListItems('details', array('name', 'description', 'oql', 'fields')); // Attributes to be displayed for the complete details