diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 24be3974539..47e1f48064a 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -28,6 +28,7 @@ create table llx_c_field_list alias varchar(32) DEFAULT NULL, -- alias of field (ex: prodref) title varchar(32) NOT NULL, -- title (translation) of field (ex: Ref) align varchar(6) DEFAULT 'left', -- align (left,center,right) + sort tinyint DEFAULT 1 NOT NULL, -- add sort field search tinyint DEFAULT 0 NOT NULL, -- add search field enabled varchar(255) DEFAULT 1, -- Condition to show or hide rang integer DEFAULT 0 diff --git a/htdocs/product/canvas/default/product.default.class.php b/htdocs/product/canvas/default/product.default.class.php index 8054a33283b..db527c3a582 100644 --- a/htdocs/product/canvas/default/product.default.class.php +++ b/htdocs/product/canvas/default/product.default.class.php @@ -77,7 +77,7 @@ class ProductDefault extends Product $this->field_list = array(); - $sql = "SELECT rowid, name, alias, title, align, search, enabled, rang"; + $sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang"; $sql.= " FROM ".MAIN_DB_PREFIX."c_field_list"; $sql.= " WHERE element = '".$this->list."'"; $sql.= " AND entity = ".$conf->entity; @@ -100,6 +100,7 @@ class ProductDefault extends Product $fieldlist["alias"] = ($obj->alias?$obj->alias:$obj->name); $fieldlist["title"] = $langs->trans($obj->title); $fieldlist["align"] = $obj->align; + $fieldlist["sort"] = $obj->sort; $fieldlist["search"] = $obj->search; $fieldlist["enabled"] = $obj->enabled; $fieldlist["order"] = $obj->rang; diff --git a/htdocs/product/canvas/default/templates/liste.tpl b/htdocs/product/canvas/default/templates/liste.tpl index 50b368375d8..fb74f444c95 100644 --- a/htdocs/product/canvas/default/templates/liste.tpl +++ b/htdocs/product/canvas/default/templates/liste.tpl @@ -40,17 +40,19 @@ {section name=field loop=$fieldlist} {strip} - {if $fieldlist[field].name} - {$fieldlist[field].title} - - A-Z - - - Z-A - - - {else} - {$fieldlist[field].title} + {if $fieldlist[field].enabled} + {if $fieldlist[field].sort} + {$fieldlist[field].title} + + A-Z + + + Z-A + + + {else} + {$fieldlist[field].title} + {/if} {/if} {/strip} @@ -63,15 +65,17 @@ {section name=searchfield loop=$fieldlist} {strip} - {if $fieldlist[searchfield].search} - - {elseif $smarty.section.search.last} - - - - - {else} -   + {if $fieldlist[searchfield].enabled} + {if $fieldlist[searchfield].search} + + {elseif $smarty.section.search.last} + + + + + {else} +   + {/if} {/if} {/strip}