Commit 9fd59c83 authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Fixed MANTIS-6103 (Catalogue field sort order confusion)

parent 0e9f7a31

cms/pages/modules/cms_catalogues.php

+6 −6
Original line number Diff line number Diff line
@@ -1931,6 +1931,12 @@ class Module_cms_catalogues_alt extends Standard_crud_module 
            $hidden->attach(form_input_hidden($prefix . 'defines_order', strval($defines_order)));

        }



        if (substr($catalogue_name, 0, 1) != '_') {

            $fields->attach(form_input_tick(do_lang_tempcode('SORTABLE'), do_lang_tempcode('DESCRIPTION_SORTABLE'), $prefix . 'is_sortable', $is_sortable == 1));

        } else {

            $hidden->attach(form_input_hidden($prefix . 'is_sortable', strval($is_sortable)));

        }



        if ($first_field) {

            $hidden->attach(form_input_hidden($prefix . 'visible', '1'));

            $hidden->attach(form_input_hidden($prefix . 'required', '1'));
@@ -1940,12 +1946,6 @@ class Module_cms_catalogues_alt extends Standard_crud_module 
        }



        $fields->attach(form_input_tick(do_lang_tempcode('SENSITIVE_FIELD'), do_lang_tempcode('DESCRIPTION_SENSITIVE_FIELD'), $prefix . 'sensitive', $sensitive == 1));



        if (substr($catalogue_name, 0, 1) != '_') {

            $fields->attach(form_input_tick(do_lang_tempcode('SORTABLE'), do_lang_tempcode('DESCRIPTION_SORTABLE'), $prefix . 'is_sortable', $is_sortable == 1));

        } else {

            $hidden->attach(form_input_hidden($prefix . 'is_sortable', strval($is_sortable)));

        }

        $fields->attach(form_input_tick(do_lang_tempcode('INCLUDE_IN_MAIN_SEARCH'), do_lang_tempcode('DESCRIPTION_INCLUDE_IN_MAIN_SEARCH'), $prefix . 'include_in_main_search', $include_in_main_search == 1));

        $fields->attach(form_input_tick(do_lang_tempcode('ALLOW_TEMPLATE_SEARCH'), do_lang_tempcode('DESCRIPTION_ALLOW_TEMPLATE_SEARCH'), $prefix . 'allow_template_search', $allow_template_search == 1));

        $fields->attach(form_input_tick(do_lang_tempcode('PUT_IN_CATEGORY'), do_lang_tempcode('DESCRIPTION_PUT_IN_CATEGORY'), $prefix . 'put_in_category', $put_in_category == 1));

lang/EN/catalogues.ini

+2 −2
Original line number Diff line number Diff line
@@ -161,8 +161,8 @@ DESCRIPTION_IS_TREE=If this is ticked (checked), then this catalogue will be dep 
FIELDS_EXISTING=Existing fields in this catalogue

FIELDS_NEW=Add new fields to this catalogue

FIELDS_NEW_HELP=Use as many of these as you need. If there are not enough, you can go back and edit the catalogue to add more.

DEFINES_ORDER=Defines sort order

DESCRIPTION_DEFINES_ORDER=Use this if this field defines the sort order for the entries. Only one field should be set for this (all others should be set to 'No').

DEFINES_ORDER=Defines default sort order

DESCRIPTION_DEFINES_ORDER=Use this if this field defines the default sort order for the entries. Only one field should be set for this (all others should be set to 'No').

SUGGEST_ADD_CATEGORY_NEXT=Your new catalogue has been added successfully.<br />As you have added a non-tree catalogue, <strong>you will need to create at least one category</strong> for entries to be filed-under (tree catalogues come with the root-category already).<br />To add your category, choose the &ldquo;Add one category&rdquo; icon.

VISIBLE=Visible

DESCRIPTION_VISIBLE=Tick (check) if the value of field will be shown to visitors. If you want to save hidden details, or if you want a hidden order field, it comes in handy to be able to make invisible fields.

themes/default/templates/BLOCK_TOP_SEARCH.tpl

+1 −0
Original line number Diff line number Diff line 
{$REQUIRE_JAVASCRIPT,search}

{$REQUIRE_JAVASCRIPT,checking}



<form class="top-button-wrapper" role="search" title="{TITLE*}" data-tpl="blockTopSearch" data-tpl-params="{+START,PARAMS_JSON,SEARCH_TYPE}{_*}{+END}" action="{$URL_FOR_GET_FORM*,{URL}}" method="get">

	{$HIDDENS_FOR_GET_FORM,{URL}}