0000746: Remove useless filters from "View Menu"

Index: admin_templates/categories/categories_edit_images.tpl =================================================================== --- admin_templates/categories/categories_edit_images.tpl (revision 13931) +++ admin_templates/categories/categories_edit_images.tpl (working copy) @@ -101,7 +101,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="c-img" IdField="ImageId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="c-img" IdField="ImageId" grid="Default"/> <script type="text/javascript"> Grids['c-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') ); </script> Index: admin_templates/categories/categories_edit_related_searches.tpl =================================================================== --- admin_templates/categories/categories_edit_related_searches.tpl (revision 13931) +++ admin_templates/categories/categories_edit_related_searches.tpl (working copy) @@ -109,7 +109,7 @@ <inp2:Field field="$field" grid="$grid"/><span class="priority"><inp2:m_ifnot check="Field" field="Priority" equals_to="0"><sup><inp2:Field field="Priority" /></sup></inp2:m_ifnot></span> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="c-search" IdField="RelatedSearchId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="c-search" IdField="RelatedSearchId" grid="Default"/> <script type="text/javascript"> Grids['c-search'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','approve','decline') ); </script> Index: admin_templates/categories/categories_edit_relations.tpl =================================================================== --- admin_templates/categories/categories_edit_relations.tpl (revision 13931) +++ admin_templates/categories/categories_edit_relations.tpl (working copy) @@ -94,7 +94,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="c-rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="c-rel" IdField="RelationshipId" grid="Default"/> <script type="text/javascript"> Grids['c-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') ); </script> Index: admin_templates/incs/menu_blocks.tpl =================================================================== --- admin_templates/incs/menu_blocks.tpl (revision 13931) +++ admin_templates/incs/menu_blocks.tpl (working copy) @@ -39,20 +39,7 @@ $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addSeparator(); <inp2:{$PrefixSpecial}_DrawFilterMenu item_block="nlsmenu_filter_block" spearator_block="nlsmenu_filter_separator" menu_name="{$PrefixSpecial}_filter_menu" ajax="$ajax"/> </inp2:m_if> - ~~- <inp2:m_if check="m_ParamEquals" name="menu_sorting" value="yes">~~ ~~- // sorting menu~~ ~~- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'] = menuMgr.createMenu(rs('<inp2:m_param name="PrefixSpecial"/>.sorting.menu'));~~ ~~- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].applyBorder(false, false, false, false);~~ ~~- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].dropShadow("none");~~ ~~- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].showIcon = true;~~ - $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.asc'), '<inp2:m_phrase name="la_common_ascending" html_escape="1" js_escape="1"/>','javascript:direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" pos="1"/>","asc",null,<inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_IsOrder" direction="asc" pos="1" >,['img/menu_dot.gif']</inp2:m_if>); - $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.desc'), '<inp2:m_phrase name="la_common_descending" html_escape="1" js_escape="1"/>','javascript:direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" pos="1"/>","desc",null,<inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_IsOrder" direction="desc" pos="1" >,['img/menu_dot.gif']</inp2:m_if>); ~~- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addSeparator();~~ - $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.def'), '<inp2:m_phrase name="la_Text_Default" html_escape="1" js_escape="1"/>','javascript:reset_sorting("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);'); ~~- <inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="header" force_block="nlsmenu_sort_block" ajax="$ajax"/>~~ ~~- </inp2:m_if>~~ - + <inp2:m_if check="m_ParamEquals" name="menu_perpage" value="yes"> // per page menu $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'] = menuMgr.createMenu(rs('<inp2:m_param name="PrefixSpecial"/>.perpage.menu')); @@ -66,17 +53,6 @@ $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.perpage.500'), '500','javascript:set_per_page("<inp2:m_param name="PrefixSpecial"/>",500,<inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="500" >,['img/check_on.gif']</inp2:m_if>); </inp2:m_if> ~~- <inp2:m_if check="m_ParamEquals" name="menu_select" value="yes">~~ ~~- // select menu~~ ~~- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'] = menuMgr.createMenu(rs('<inp2:m_param name="PrefixSpecial"/>.select.menu'));~~ ~~- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].applyBorder(false, false, false, false);~~ ~~- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].dropShadow("none");~~ ~~- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].showIcon = true;~~ - $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.select.all'), '<inp2:m_phrase name="la_Text_All" html_escape="1" js_escape="1"/>','javascript:Grids["<inp2:m_param name="PrefixSpecial"/>"].SelectAll();'); - $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.unselect'), '<inp2:m_phrase name="la_Text_Unselect" html_escape="1" js_escape="1"/>','javascript:Grids["<inp2:m_param name="PrefixSpecial"/>"].ClearSelection();'); - $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.invert'), '<inp2:m_phrase name="la_Text_Invert" html_escape="1" js_escape="1"/>','javascript:Grids["<inp2:m_param name="PrefixSpecial"/>"].InvertSelection();'); ~~- </inp2:m_if>~~ - $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'] = menuMgr.createMenu(rs('<inp2:m_param name="PrefixSpecial"/>'+'_view_menu')); $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].applyBorder(false, false, false, false); $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].dropShadow("none"); @@ -97,16 +73,11 @@ <inp2:m_if check="m_ParamEquals" name="menu_filters" value="yes"> $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.filters'), '<inp2:m_phrase name="la_Text_View" html_escape="1" js_escape="1"/>', 'javascript:void()', null, true, null, rs('<inp2:m_param name="PrefixSpecial"/>.filter.menu'), null); </inp2:m_if> ~~- <inp2:m_if check="m_ParamEquals" name="menu_sorting" value="yes">~~ - $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sorting'), '<inp2:m_phrase name="la_Text_Sort" html_escape="1" js_escape="1"/>', 'javascript:void()', null, true, null, rs('<inp2:m_param name="PrefixSpecial"/>.sorting.menu'), null); ~~- </inp2:m_if>~~ + <inp2:m_if check="m_ParamEquals" name="menu_perpage" value="yes"> $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.perpage'), '<inp2:m_phrase name="la_prompt_PerPage" html_escape="1" js_escape="1"/>', 'javascript:void()', null, true, null, rs('<inp2:m_param name="PrefixSpecial"/>.perpage.menu'), null); </inp2:m_if> ~~- <inp2:m_if check="m_ParamEquals" name="menu_select" value="yes">~~ - $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.select'), '<inp2:m_phrase name="la_Text_Select" html_escape="1" js_escape="1"/>', 'javascript:void()', null, true, null, rs('<inp2:m_param name="PrefixSpecial"/>.select.menu'), null); ~~- </inp2:m_if>~~ - + $MenuNames['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'] = '<inp2:{$PrefixSpecial}_GetItemName js_escape="1"/>'; Application.processHooks('<inp2:m_param name="PrefixSpecial"/>:OnCreateViewMenu'); Index: admin_templates/languages/language_list.tpl =================================================================== --- admin_templates/languages/language_list.tpl (revision 13931) +++ admin_templates/languages/language_list.tpl (working copy) @@ -41,7 +41,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="lang" IdField="LanguageId" grid="LangManagement" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="lang" IdField="LanguageId" grid="LangManagement"/> <script type="text/javascript"> Grids['lang'].SetDependantToolbarButtons( new Array('edit','delete','setprimary','export_language') ); </script> Index: admin_templates/modules/modules_list.tpl =================================================================== --- admin_templates/modules/modules_list.tpl (revision 13931) +++ admin_templates/modules/modules_list.tpl (working copy) @@ -72,7 +72,7 @@ </inp2:m_if> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="mod" IdField="Name" per_page="-1" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="mod" IdField="Name" per_page="-1" grid="Default"/> <script type="text/javascript"> Grids['mod'].SetDependantToolbarButtons( new Array('approve','deny') ); Index: admin_templates/regional/languages_edit_email_events.tpl =================================================================== --- admin_templates/regional/languages_edit_email_events.tpl (revision 13931) +++ admin_templates/regional/languages_edit_email_events.tpl (working copy) @@ -70,7 +70,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="emailevents" IdField="EventId" grid="Default" menu_filters="yes" main_prefix="lang"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="emailevents" IdField="EventId" grid="Default" main_prefix="lang"/> <script type="text/javascript"> Grids['emailevents'].SetDependantToolbarButtons( new Array('edit') ); </script> Index: admin_templates/regional/languages_list.tpl =================================================================== --- admin_templates/regional/languages_list.tpl (revision 13931) +++ admin_templates/regional/languages_list.tpl (working copy) @@ -66,7 +66,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="lang" IdField="LanguageId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="lang" IdField="LanguageId" grid="Default"/> <script type="text/javascript"> Grids['lang'].SetDependantToolbarButtons( new Array('edit','delete','setprimary','export') ); </script> Index: admin_templates/reviews/reviews_tab.tpl =================================================================== --- admin_templates/reviews/reviews_tab.tpl (revision 13931) +++ admin_templates/reviews/reviews_tab.tpl (working copy) @@ -20,7 +20,7 @@ </span> </inp2:m_DefineElement> ~~- <inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="ReviewId" grid="$grid_name" menu_filters="yes"/>~~ + <inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="ReviewId" grid="$grid_name"/> <inp2:m_if check="m_ParamEquals" name="tab_dependant" value="yes"> Grids['<inp2:m_param name="prefix"/>'].AddAlternativeGrid('<inp2:m_param name="cat_prefix"/>', true); @@ -34,7 +34,7 @@ #separator#  <inp2:m_RenderElement name="kernel_form" form_name="{$tab_name}_form"/> ~~- <inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="ReviewId" grid="$grid_name" menu_filters="yes"/>~~ + <inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="ReviewId" grid="$grid_name"/> <inp2:m_RenderElement name="kernel_form_end"/>  </inp2:m_if> Index: admin_templates/stylesheets/stylesheets_list.tpl =================================================================== --- admin_templates/stylesheets/stylesheets_list.tpl (revision 13931) +++ admin_templates/stylesheets/stylesheets_list.tpl (working copy) @@ -60,7 +60,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="css" IdField="StylesheetId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="css" IdField="StylesheetId" grid="Default"/> <script type="text/javascript"> Grids['css'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','clone') ); </script> Index: admin_templates/themes/themes_list.tpl =================================================================== --- admin_templates/themes/themes_list.tpl (revision 13931) +++ admin_templates/themes/themes_list.tpl (working copy) @@ -54,7 +54,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="theme" IdField="ThemeId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="theme" IdField="ThemeId" grid="Default"/> <script type="text/javascript"> Grids['theme'].SetDependantToolbarButtons( new Array('edit', 'delete', 'setprimary') ); </script> Index: admin_templates/user_selector.tpl =================================================================== --- admin_templates/user_selector.tpl (revision 13931) +++ admin_templates/user_selector.tpl (working copy) @@ -53,7 +53,7 @@ </script> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="u" IdField="PortalUserId" grid="UserSelector" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="u" IdField="PortalUserId" grid="UserSelector"/> <script type="text/javascript"> Grids['u'].SetDependantToolbarButtons( new Array('select') ); </script> Index: admin_templates/users/admins_list.tpl =================================================================== --- admin_templates/users/admins_list.tpl (revision 13931) +++ admin_templates/users/admins_list.tpl (working copy) @@ -61,7 +61,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins"/> <script type="text/javascript"> Grids['u.admins'].SetDependantToolbarButtons( new Array('edit','delete','clone') ); </script> Index: admin_templates/users/user_edit_images.tpl =================================================================== --- admin_templates/users/user_edit_images.tpl (revision 13931) +++ admin_templates/users/user_edit_images.tpl (working copy) @@ -113,7 +113,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="u-img" IdField="ImageId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="u-img" IdField="ImageId" grid="Default"/> <script type="text/javascript"> Grids['u-img'].SetDependantToolbarButtons( new Array('edit', 'delete', 'move_up', 'move_down', 'setprimary', 'approve', 'decline') ); </script> Index: admin_templates/users/user_selector.tpl =================================================================== --- admin_templates/users/user_selector.tpl (revision 13931) +++ admin_templates/users/user_selector.tpl (working copy) @@ -43,7 +43,7 @@ </script> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="u.group" IdField="PortalUserId" grid="UserSelector" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="u.group" IdField="PortalUserId" grid="UserSelector"/> <script type="text/javascript"> Grids['u.group'].SetDependantToolbarButtons( new Array('select') ); // Grids['u'].DblClick = function() {return false}; Index: admin_templates/users/users_list.tpl =================================================================== --- admin_templates/users/users_list.tpl (revision 13931) +++ admin_templates/users/users_list.tpl (working copy) @@ -91,7 +91,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="u.regular" IdField="PortalUserId" grid="RegularUsers" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="u.regular" IdField="PortalUserId" grid="RegularUsers"/> <script type="text/javascript"> Grids['u.regular'].SetDependantToolbarButtons( new Array('edit', 'delete', 'e-mail', 'approve', 'decline') ); </script> Index: units/categories/categories_config.php =================================================================== --- units/categories/categories_config.php (revision 13931) +++ units/categories/categories_config.php (working copy) @@ -251,16 +251,11 @@ ), 'FilterMenu' => Array ( ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER),~~ + 'Groups' => Array ( Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), ), ~~- 'Filters' => Array (~~ ~~- 'show_active' => Array ('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Status != 1'),~~ ~~- 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => 'Status != 2'),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0'),~~ ~~- 's1' => Array (),~~ + 'Filters' => Array ( 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'), 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '`EditorsPick` != 1'), ) Index: units/email_events/email_events_config.php =================================================================== --- units/email_events/email_events_config.php (revision 13931) +++ units/email_events/email_events_config.php (working copy) @@ -88,18 +88,6 @@ ), ), ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_enabled', 'show_disabled', 'show_frontonly'), 'type' => WHERE_FILTER),~~ ~~- ),~~ - ~~- 'Filters' => Array (~~ ~~- 'show_enabled' => Array ('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ),~~ ~~- 'show_frontonly' => Array ('label' => 'la_Text_FrontOnly', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 2' ),~~ ~~- )~~ ~~- ),~~ - 'TableName' => TABLE_PREFIX . 'Events', 'ListSQLs' => Array ( Index: units/files/files_config.php =================================================================== --- units/files/files_config.php (revision 13931) +++ units/files/files_config.php (working copy) @@ -41,17 +41,6 @@ 'AutoDelete' => true, 'AutoClone' => true, ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active','show_disabled'), 'type' => WHERE_FILTER),~~ ~~- ),~~ - ~~- 'Filters' => Array(~~ ~~- 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- )~~ ~~- ),~~ - 'ListSQLs' => Array ( '' => 'SELECT * FROM %s', ), Index: units/images/images_config.php =================================================================== --- units/images/images_config.php (revision 13931) +++ units/images/images_config.php (working copy) @@ -84,32 +84,23 @@ 'AutoDelete' => true, 'AutoClone' => true, ~~- 'FilterMenu' => Array(~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array(~~ ~~- 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Enabled != 1' ),~~ ~~- 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Enabled != 0' ),~~ ~~- )~~ ~~- ),~~ - 'CalculatedFields' => Array( ~~- '' => Array(~~ ~~- 'Preview' => '0',~~ ~~- ),~~ ~~- ),~~ + '' => Array ( + 'Preview' => '0', + ), + ), 'ListSQLs' => Array( ''=>'SELECT * FROM %s', ), // key - special, value - list select sql 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', ), 'ListSortings' => Array( ~~- '' => Array(~~ ~~- 'ForcedSorting' => Array('Priority' => 'desc'),~~ ~~- 'Sorting' => Array('Name' => 'asc'),~~ ~~- )~~ ~~- ),~~ + '' => Array( + 'ForcedSorting' => Array('Priority' => 'desc'), + 'Sorting' => Array('Name' => 'asc'), + ) + ), + 'Fields' => Array ( 'ImageId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'ResourceId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), Index: units/languages/languages_config.php =================================================================== --- units/languages/languages_config.php (revision 13931) +++ units/languages/languages_config.php (working copy) @@ -136,19 +136,8 @@ ),*/ ), ~~- 'TableName' => TABLE_PREFIX.'Language',~~ + 'TableName' => TABLE_PREFIX . 'Language', ~~- 'FilterMenu' => Array(~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER),~~ ~~- ),~~ - ~~- 'Filters' => Array(~~ ~~- 0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),~~ ~~- 1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ),~~ ~~- )~~ ~~- ),~~ - 'AutoDelete' => true, 'AutoClone' => true, Index: units/modules/modules_config.php =================================================================== --- units/modules/modules_config.php (revision 13931) +++ units/modules/modules_config.php (working copy) @@ -66,18 +66,8 @@ ),*/ ), ~~- 'TableName' => TABLE_PREFIX.'Modules',~~ + 'TableName' => TABLE_PREFIX . 'Modules', ~~- 'FilterMenu' => Array(~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array('enabled', 'disabled'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array(~~ ~~- 'enabled' => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Loaded != 1'),~~ ~~- 'disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Loaded != 0'),~~ ~~- )~~ ~~- ),~~ - 'ListSQLs' => Array( ''=>'SELECT * FROM %s', ), // key - special, value - list select sql 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', Index: units/phrases/phrases_config.php =================================================================== --- units/phrases/phrases_config.php (revision 13931) +++ units/phrases/phrases_config.php (working copy) @@ -77,15 +77,10 @@ ), 'FilterMenu' => Array ( ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_front', 'show_admin', 'show_both'), 'type' => WHERE_FILTER),~~ + 'Groups' => Array ( Array ('mode' => 'AND', 'filters' => Array ('translated', 'not_translated'), 'type' => HAVING_FILTER), ), ~~- 'Filters' => Array (~~ ~~- 'show_front' => Array ('label' =>'la_PhraseType_Front', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 0'),~~ ~~- 'show_admin' => Array ('label' => 'la_PhraseType_Admin', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 1'),~~ ~~- 'show_both' => Array ('label' => 'la_PhraseType_Both', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 2'),~~ ~~- 's1' => Array (),~~ + 'Filters' => Array ( 'translated' => Array ('label' => 'la_PhraseTranslated', 'on_sql' => '', 'off_sql' => 'CurrentTranslation IS NULL'), 'not_translated' => Array ('label' => 'la_PhraseNotTranslated', 'on_sql' => '', 'off_sql' => 'CurrentTranslation IS NOT NULL'), ) Index: units/related_searches/related_searches_config.php =================================================================== --- units/related_searches/related_searches_config.php (revision 13931) +++ units/related_searches/related_searches_config.php (working copy) @@ -42,22 +42,11 @@ 'AutoDelete' => true, 'AutoClone' => true, ~~- 'FilterMenu' => Array(~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array(~~ ~~- 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Enabled != 1' ),~~ ~~- 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Enabled != 0' ),~~ ~~- )~~ ~~- ),~~ + 'CalculatedFields' => Array ( + '' => Array ( + ), + ), ~~- 'CalculatedFields' => Array(~~ ~~- '' => Array(~~ - ~~- ),~~ ~~- ),~~ - 'ListSQLs' => Array( ''=> 'SELECT %1$s.* %2$s FROM %1$s', ), // key - special, value - list select sql Index: units/relationship/relationship_config.php =================================================================== --- units/relationship/relationship_config.php (revision 13931) +++ units/relationship/relationship_config.php (working copy) @@ -49,27 +49,13 @@ 'AutoDelete' => true, 'AutoClone' => true, ~~- 'FilterMenu' => Array(~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER),~~ ~~- Array('mode' => 'AND', 'filters' => Array('show_recip','show_oneway'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array(~~ ~~- 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Enabled != 1' ),~~ ~~- 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Enabled != 0' ),~~ ~~- 's1' => Array(),~~ ~~- 'show_recip' => Array('label' => 'la_Reciprocal', 'on_sql' => '', 'off_sql' => '%1$s.Type != 1' ),~~ ~~- 'show_oneway' => Array('label' => 'la_OneWay', 'on_sql' => '', 'off_sql' => '%1$s.Type != 2' ),~~ ~~- )~~ ~~- ),~~ + 'CalculatedFields' => Array ( + '' => Array ( + 'ItemName' => 'TRIM(CONCAT(#ITEM_NAMES#))', + 'ItemType' => '#ITEM_TYPES#', + ), + ), ~~- 'CalculatedFields' => Array(~~ ~~- '' => Array(~~ ~~- 'ItemName' => 'TRIM(CONCAT(#ITEM_NAMES#))',~~ ~~- 'ItemType' => '#ITEM_TYPES#',~~ ~~- ),~~ ~~- ),~~ - 'ListSQLs' => Array( ''=> 'SELECT %1$s.RelationshipId, %1$s.Priority, %1$s.Type, %1$s.Enabled %2$s FROM %1$s #ITEM_JOIN#', ), // key - special, value - list select sql Index: units/reviews/reviews_config.php =================================================================== --- units/reviews/reviews_config.php (revision 13931) +++ units/reviews/reviews_config.php (working copy) @@ -56,17 +56,6 @@ ), ), ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array (~~ ~~- 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- )~~ ~~- ),~~ - 'CalculatedFields' => Array ( '' => Array ( 'ReviewedBy' => 'IF( ISNULL(pu.Login), IF (%1$s.CreatedById = ' . USER_ROOT . ', \'root\', IF (%1$s.CreatedById = ' . USER_GUEST . ', \'Guest\', \'n/a\')), pu.Login )', Index: units/stylesheets/stylesheets_config.php =================================================================== --- units/stylesheets/stylesheets_config.php (revision 13931) +++ units/stylesheets/stylesheets_config.php (working copy) @@ -122,19 +122,8 @@ 'TableName' => TABLE_PREFIX.'Stylesheets', 'SubItems' => Array('selectorsbase', 'selectorsblock'), ~~- 'FilterMenu' => Array(~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER),~~ ~~- ),~~ + 'AutoDelete' => true, ~~- 'Filters' => Array(~~ ~~- 0 => Array('label' => 'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1'),~~ ~~- 1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0'),~~ ~~- ),~~ ~~- ),~~ - ~~- 'AutoDelete' => true,~~ - 'AutoClone' => true, 'ListSQLs' => Array( Index: units/themes/themes_config.php =================================================================== --- units/themes/themes_config.php (revision 13931) +++ units/themes/themes_config.php (working copy) @@ -92,18 +92,7 @@ 'TableName' => TABLE_PREFIX.'Theme', 'SubItems' => Array('theme-file'), - ~~- 'FilterMenu' => Array(~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER),~~ ~~- ),~~ - ~~- 'Filters' => Array(~~ ~~- 0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),~~ ~~- 1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ),~~ ~~- )~~ ~~- ),~~ - + 'AutoDelete' => true, 'AutoClone' => true, Index: units/users/users_config.php =================================================================== --- units/users/users_config.php (revision 13931) +++ units/users/users_config.php (working copy) @@ -311,17 +311,6 @@ 'SubItems' => Array('addr', 'u-cdata', 'u-ug', 'u-img', 'fav', 'user-profile'), ~~- 'FilterMenu' => Array(~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled','show_pending'), 'type' => WHERE_FILTER),~~ ~~- ),~~ - ~~- 'Filters' => Array(~~ ~~- 'show_active' => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- 'show_pending' => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ),~~ ~~- )~~ ~~- ),~~ /** * Required for depricated public profile templates to work */

Index: in-bulletin/admin_templates/topics/topics_images.tpl =================================================================== --- in-bulletin/admin_templates/topics/topics_images.tpl (revision 13931) +++ in-bulletin/admin_templates/topics/topics_images.tpl (working copy) @@ -99,7 +99,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="bb-img" IdField="ImageId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="bb-img" IdField="ImageId" grid="Default"/> <script type="text/javascript"> Grids['bb-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') ); </script> Index: in-bulletin/admin_templates/topics/topics_relations.tpl =================================================================== --- in-bulletin/admin_templates/topics/topics_relations.tpl (revision 13931) +++ in-bulletin/admin_templates/topics/topics_relations.tpl (working copy) @@ -92,7 +92,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="bb-rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="bb-rel" IdField="RelationshipId" grid="Default"/> <script type="text/javascript"> Grids['bb-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') ); </script> Index: in-bulletin/admin_templates/topics/topics_reviews.tpl =================================================================== --- in-bulletin/admin_templates/topics/topics_reviews.tpl (revision 13931) +++ in-bulletin/admin_templates/topics/topics_reviews.tpl (working copy) @@ -106,7 +106,7 @@ <inp2:Field field="$field" no_special="no_special" cut_first="100"/> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="bb-rev" IdField="ReviewId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="bb-rev" IdField="ReviewId" grid="Default"/> <script type="text/javascript"> Grids['bb-rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') ); </script> Index: in-bulletin/units/topics/topics_config.php =================================================================== --- in-bulletin/units/topics/topics_config.php (revision 13931) +++ in-bulletin/units/topics/topics_config.php (working copy) @@ -243,24 +243,19 @@ ), 'FilterMenu' => Array ( ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array (~~ ~~- 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- 's1' => Array (),~~ ~~- 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ),~~ ~~- 'show_hot' => Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ),~~ ~~- 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ),~~ ~~- 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ),~~ ~~- )~~ ~~- ),~~ + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), + ), + 'Filters' => Array ( + 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ), + 'show_hot' => Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ), + 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ), + 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ), + ), + ), 'CatalogSelectorName' => 'topiclist', Index: in-commerce/admin_templates/discounts/coupon_selector.tpl =================================================================== --- in-commerce/admin_templates/discounts/coupon_selector.tpl (revision 13931) +++ in-commerce/admin_templates/discounts/coupon_selector.tpl (working copy) @@ -42,6 +42,6 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="coup" IdField="CouponId" grid="Radio" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="coup" IdField="CouponId" grid="Radio"/> <inp2:m_include t="incs/footer"/> \ No newline at end of file Index: in-commerce/admin_templates/discounts/coupons_list.tpl =================================================================== --- in-commerce/admin_templates/discounts/coupons_list.tpl (revision 13931) +++ in-commerce/admin_templates/discounts/coupons_list.tpl (working copy) @@ -59,7 +59,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="coup" IdField="CouponId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="coup" IdField="CouponId" grid="Default"/> <script type="text/javascript"> Grids['coup'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','clone') ); </script> Index: in-commerce/admin_templates/discounts/discounts_list.tpl =================================================================== --- in-commerce/admin_templates/discounts/discounts_list.tpl (revision 13931) +++ in-commerce/admin_templates/discounts/discounts_list.tpl (working copy) @@ -53,7 +53,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="d" IdField="DiscountId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="d" IdField="DiscountId" grid="Default"/> <script type="text/javascript"> Grids['d'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') ); </script> Index: in-commerce/admin_templates/discounts/gift_certificate_list.tpl =================================================================== --- in-commerce/admin_templates/discounts/gift_certificate_list.tpl (revision 13931) +++ in-commerce/admin_templates/discounts/gift_certificate_list.tpl (working copy) @@ -46,7 +46,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="gc" IdField="GiftCertificateId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="gc" IdField="GiftCertificateId" grid="Default"/> <script type="text/javascript"> Grids['gc'].SetDependantToolbarButtons( new Array('edit','delete','e-mail') ); Index: in-commerce/admin_templates/orders/orders_search_list.tpl =================================================================== --- in-commerce/admin_templates/orders/orders_search_list.tpl (revision 13931) +++ in-commerce/admin_templates/orders/orders_search_list.tpl (working copy) @@ -53,7 +53,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="ord.search" IdField="OrderId" grid="Search" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="ord.search" IdField="OrderId" grid="Search"/> <script type="text/javascript"> Grids['ord.search'].SetDependantToolbarButtons( new Array('edit','delete','print','goto_order','archive') ); Index: in-commerce/admin_templates/payment_type/payment_type_list.tpl =================================================================== --- in-commerce/admin_templates/payment_type/payment_type_list.tpl (revision 13931) +++ in-commerce/admin_templates/payment_type/payment_type_list.tpl (working copy) @@ -81,7 +81,7 @@ </script> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="pt" IdField="PaymentTypeId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="pt" IdField="PaymentTypeId" grid="Default"/> <script type="text/javascript"> Grids['pt'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline', 'setprimary', 'move_up', 'move_down') ); Index: in-commerce/admin_templates/products/option_combinations.tpl =================================================================== --- in-commerce/admin_templates/products/option_combinations.tpl (revision 13931) +++ in-commerce/admin_templates/products/option_combinations.tpl (working copy) @@ -153,7 +153,7 @@ </table> </div> ~~-<inp2:m_RenderElement name="grid" main_special="" PrefixSpecial="poc.grid" IdField="CombinationId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" main_special="" PrefixSpecial="poc.grid" IdField="CombinationId" grid="Default"/> <script type="text/javascript"> Grids['poc.grid'].SetDependantToolbarButtons( new Array('delete', 'move_up', 'move_down') ); </script> Index: in-commerce/admin_templates/products/products_images.tpl =================================================================== --- in-commerce/admin_templates/products/products_images.tpl (revision 13931) +++ in-commerce/admin_templates/products/products_images.tpl (working copy) @@ -99,7 +99,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="img" IdField="ImageId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="img" IdField="ImageId" grid="Default"/> <script type="text/javascript"> Grids['img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') ); </script> Index: in-commerce/admin_templates/products/products_packagecontent.tpl =================================================================== --- in-commerce/admin_templates/products/products_packagecontent.tpl (revision 13931) +++ in-commerce/admin_templates/products/products_packagecontent.tpl (working copy) @@ -84,7 +84,7 @@ <inp2:Field field="QtyInStock" grid="$grid"/>/<inp2:Field field="QtyReserved" grid="$grid"/> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="p.content" IdField="ProductId" grid="Default" menu_filters="yes" types="content"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="p.content" IdField="ProductId" grid="Default" types="content"/> <input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>"> <input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>"> <input type="hidden" name="main_prefix" id="main_prefix" value="p"> Index: in-commerce/admin_templates/products/products_relations.tpl =================================================================== --- in-commerce/admin_templates/products/products_relations.tpl (revision 13931) +++ in-commerce/admin_templates/products/products_relations.tpl (working copy) @@ -92,7 +92,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="rel" IdField="RelationshipId" grid="Default"/> <script type="text/javascript"> Grids['rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') ); </script> Index: in-commerce/admin_templates/products/products_reviews.tpl =================================================================== --- in-commerce/admin_templates/products/products_reviews.tpl (revision 13931) +++ in-commerce/admin_templates/products/products_reviews.tpl (working copy) @@ -107,7 +107,7 @@ <inp2:Field field="$field" no_special="no_special" cut_first="100"/> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="rev" IdField="ReviewId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="rev" IdField="ReviewId" grid="Default"/> <script type="text/javascript"> Grids['rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') ); </script> Index: in-commerce/admin_templates/shipping/shipping_custom_list.tpl =================================================================== --- in-commerce/admin_templates/shipping/shipping_custom_list.tpl (revision 13931) +++ in-commerce/admin_templates/shipping/shipping_custom_list.tpl (working copy) @@ -61,7 +61,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="s" IdField="ShippingID" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="s" IdField="ShippingID" grid="Default"/> <script type="text/javascript"> Grids['s'].SetDependantToolbarButtons( new Array('edit','delete','clone','approve','decline') ); </script> Index: in-commerce/admin_templates/shipping/shipping_list.tpl =================================================================== --- in-commerce/admin_templates/shipping/shipping_list.tpl (revision 13931) +++ in-commerce/admin_templates/shipping/shipping_list.tpl (working copy) @@ -45,7 +45,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="sqe" IdField="EngineId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="sqe" IdField="EngineId" grid="Default"/> <script type="text/javascript"> Grids['sqe'].SetDependantToolbarButtons( new Array('edit','approve','decline') ); </script> Index: in-commerce/units/coupons/coupons_config.php =================================================================== --- in-commerce/units/coupons/coupons_config.php (revision 13931) +++ in-commerce/units/coupons/coupons_config.php (working copy) @@ -91,32 +91,17 @@ ), ), ~~- 'FilterMenu' => Array(~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER),~~ ~~- Array('mode' => 'AND', 'filters' => Array(4,5/*,6*/), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array(~~ ~~- 0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => 'Status != 1' ),~~ ~~- 1 => Array('label' => 'la_Used', 'on_sql' => '', 'off_sql' => 'Status != 2' ),~~ ~~- 2 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0' ),~~ ~~- 3 => Array(),~~ ~~- 4 => Array('label' => 'la_Flat', 'on_sql' => '', 'off_sql' => 'Type != 1' ),~~ ~~- 5 => Array('label' => 'la_Percent', 'on_sql' => '', 'off_sql' => 'Type != 2' ),~~ ~~- // 6 => Array('label' => 'la_FreeShipping', 'on_sql' => '', 'off_sql' => 'Type != 3' ),~~ ~~- )~~ ~~- ),~~ - 'ListSQLs' => Array( ''=>'SELECT %1$s.* %2$s FROM %1$s', ), // key - special, value - list select sql 'ItemSQLs' => Array( ''=>'SELECT * FROM %1$s', ), ~~- 'ListSortings' => Array(~~ ~~- '' => Array(~~ ~~- 'Sorting' => Array('Name' => 'asc'),~~ ~~- )~~ ~~- ),~~ + 'ListSortings' => Array ( + '' => Array( + 'Sorting' => Array('Name' => 'asc'), + ) + ), + 'Fields' => Array( 'CouponId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ( Index: in-commerce/units/discounts/discounts_config.php =================================================================== --- in-commerce/units/discounts/discounts_config.php (revision 13931) +++ in-commerce/units/discounts/discounts_config.php (working copy) @@ -111,41 +111,47 @@ 'Sorting' => Array('Name' => 'asc'), ) ), ~~- 'Fields' => Array(~~ ~~- 'DiscountId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),~~ - 'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'default' => 2 ), ~~- 'Name' => Array('type'=>'string','required' => 1, 'default' => null, 'max_len'=>255),~~ ~~- 'Start' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),~~ ~~- 'End' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),~~ ~~- 'GroupId' => Array(~~ ~~- 'type' => 'int',~~ - 'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalGroup WHERE Personal = 0 ORDER BY Name', 'option_key_field'=>'GroupId', 'option_title_field'=>'Name', ~~- 'required' => 1, 'default' => NULL~~ ~~- ),~~ - 'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Flat', 2 => 'la_Percent'/*, 3 => 'la_FreeShipping' */), 'default' => 1 ), ~~- 'Amount' => Array('type'=>'double', 'default' => null),~~ + 'Fields' => Array ( + 'DiscountId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'default' => 2 ), + 'Name' => Array('type'=>'string','required' => 1, 'default' => null, 'max_len'=>255), + 'Start' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'End' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), + 'GroupId' => Array( + 'type' => 'int', + 'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalGroup WHERE Personal = 0 ORDER BY Name', 'option_key_field'=>'GroupId', 'option_title_field'=>'Name', + 'required' => 1, 'default' => NULL + ), + 'Type' => Array( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( + 1 => 'la_Flat', 2 => 'la_Percent'/*, 3 => 'la_FreeShipping' */ + ), + 'default' => 1, 'use_phrases' => 1, + ), + 'Amount' => Array('type'=>'double', 'default' => null), + ), ~~- ),~~ - ~~- 'Grids' => Array(~~ ~~- 'Default' => Array(~~ ~~- 'Icons' => Array(~~ ~~- 'default' => 'icon16_item.png',~~ ~~- 0 => 'icon16_disabled.png',~~ ~~- 1 => 'icon16_item.png',~~ ~~- 2 => 'icon16_pending.png',~~ ~~- 'module' => 'core',~~ ~~- ),~~ ~~- 'Fields' => Array(~~ ~~- 'DiscountId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),~~ ~~- 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),~~ ~~- 'Start' => Array( 'title'=>'la_col_Start', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),~~ ~~- 'End' => Array( 'title'=>'la_col_End', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),~~ ~~- 'GroupId' => Array( 'title'=>'la_col_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ),~~ ~~- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 90, ),~~ ~~- 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ ~~- ),~~ - ~~- ),~~ ~~- ),~~ + 'Grids' => Array ( + 'Default' => Array ( + 'Icons' => Array( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + 2 => 'icon16_pending.png', + 'module' => 'core', + ), + 'Fields' => Array ( + 'DiscountId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Start' => Array( 'title'=>'la_col_Start', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'End' => Array( 'title'=>'la_col_End', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'GroupId' => Array( 'title'=>'la_col_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ), + 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 90, ), + 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 90, ), + 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ), + ), + ), + ), ); \ No newline at end of file Index: in-commerce/units/files/files_config.php =================================================================== --- in-commerce/units/files/files_config.php (revision 13931) +++ in-commerce/units/files/files_config.php (working copy) @@ -56,25 +56,21 @@ 'AutoDelete' => true, 'AutoClone' => true, ~~- 'ListSQLs' => Array ( '' => 'SELECT * FROM %s',~~ ~~- ), // key - special, value - list select sql~~ ~~- 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s',~~ ~~- ),~~ ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array (~~ ~~- 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- )~~ ~~- ),~~ + 'ListSQLs' => Array ( + '' => 'SELECT * FROM %s', + ), // key - special, value - list select sql + + 'ItemSQLs' => Array ( + '' => 'SELECT * FROM %s', + ), + 'ListSortings' => Array ( ~~- '' => Array (~~ ~~- 'ForcedSorting' => Array ('IsPrimary' => 'desc', 'Priority' => 'desc'),~~ ~~- 'Sorting' => Array ('AddedOn' => 'desc', 'Version' => 'desc'),~~ ~~- )~~ ~~- ),~~ + '' => Array ( + 'ForcedSorting' => Array ('IsPrimary' => 'desc', 'Priority' => 'desc'), + 'Sorting' => Array ('AddedOn' => 'desc', 'Version' => 'desc'), + ) + ), + 'Fields' => Array ( 'FileId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), 'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), Index: in-commerce/units/gift_certificates/gift_certificates_config.php =================================================================== --- in-commerce/units/gift_certificates/gift_certificates_config.php (revision 13931) +++ in-commerce/units/gift_certificates/gift_certificates_config.php (working copy) @@ -70,20 +70,8 @@ 'priority' => 3.3, // <parent_priority>.<own_priority>, because this section replaces parent in tree 'type' => stTAB, ), ~~- ),~~ + ), ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array(~~ ~~- Array ('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER),~~ ~~- ),~~ - ~~- 'Filters' => Array(~~ ~~- 0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => 'Status != 1' ),~~ ~~- 1 => Array('label' => 'la_Used', 'on_sql' => '', 'off_sql' => 'Status != 2' ),~~ ~~- 2 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0' ),~~ ~~- )~~ ~~- ),~~ - 'ListSQLs' => Array ('' => 'SELECT %1$s.* %2$s FROM %1$s',), 'ItemSQLs' => Array ('' => 'SELECT * FROM %1$s',), Index: in-commerce/units/orders/orders_config.php =================================================================== --- in-commerce/units/orders/orders_config.php (revision 13931) +++ in-commerce/units/orders/orders_config.php (working copy) @@ -226,24 +226,8 @@ ), ), ~~- 'TableName' => TABLE_PREFIX.'Orders',~~ + 'TableName' => TABLE_PREFIX . 'Orders', ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array (0,1,2,3,4,5,6), 'type' => WHERE_FILTER),~~ ~~- ),~~ - ~~- 'Filters' => Array (~~ ~~- 0 => Array ('label' => 'la_Incomplete', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- 1 => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 2 => Array ('label' => 'la_BackOrders', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ),~~ ~~- 3 => Array ('label' => 'la_ToShip', 'on_sql' => '', 'off_sql' => '%1$s.Status != 3' ),~~ ~~- 4 => Array ('label' => 'la_Processed', 'on_sql' => '', 'off_sql' => '%1$s.Status != 4' ),~~ ~~- 5 => Array ('label' => 'la_Denied', 'on_sql' => '', 'off_sql' => '%1$s.Status != 5' ),~~ ~~- 6 => Array ('label' => 'la_Archived', 'on_sql' => '', 'off_sql' => '%1$s.Status != 6' ),~~ ~~- )~~ ~~- ),~~ - 'CalculatedFields' => Array ( '' => Array ( 'CustomerName' => 'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), CONCAT(u.FirstName,\' \',u.LastName) )', Index: in-commerce/units/payment_type/payment_type_config.php =================================================================== --- in-commerce/units/payment_type/payment_type_config.php (revision 13931) +++ in-commerce/units/payment_type/payment_type_config.php (working copy) @@ -79,21 +79,11 @@ 'TitleField' => 'Name', // field, used in bluebar when editing existing item 'SubItems' => Array ('gwfv', 'ptc'), ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array (~~ ~~- 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- )~~ ~~- ),~~ - 'CalculatedFields' => Array ( ~~- '' => Array (~~ ~~- 'Gateway' => TABLE_PREFIX.'Gateways.Name',~~ ~~- ),~~ ~~- ),~~ + '' => Array ( + 'Gateway' => TABLE_PREFIX . 'Gateways.Name', + ), + ), 'ListSQLs' => Array ( '' => ' SELECT %1$s.* %2$s FROM %1$s @@ -102,11 +92,12 @@ 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s', ), 'ListSortings' => Array ( ~~- '' => Array (~~ ~~- 'ForcedSorting' => Array ('Priority' => 'desc'),~~ ~~- 'Sorting' => Array ('Name' => 'asc'),~~ ~~- )~~ ~~- ),~~ + '' => Array ( + 'ForcedSorting' => Array ('Priority' => 'desc'), + 'Sorting' => Array ('Name' => 'asc'), + ) + ), + 'Fields' => Array ( 'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' =>true, 'max_len' => 100), Index: in-commerce/units/products/products_config.php =================================================================== --- in-commerce/units/products/products_config.php (revision 13931) +++ in-commerce/units/products/products_config.php (working copy) @@ -345,33 +345,22 @@ ), 'FilterMenu' => Array ( ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_tang', 'show_sub', 'show_serv', 'show_download', 'show_package'), 'type' => WHERE_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array (~~ ~~- 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- 's1' => Array (),~~ ~~- 'show_tang' => Array ('label' => 'la_product_tangible', 'on_sql' => '', 'off_sql' => '%1$s.Type != 1' ),~~ ~~- 'show_sub' => Array ('label' => 'la_product_subscription', 'on_sql' => '', 'off_sql' => '%1$s.Type != 2' ),~~ ~~- 'show_serv' => Array ('label' => 'la_product_service', 'on_sql' => '', 'off_sql' => '%1$s.Type != 3' ),~~ ~~- 'show_download' => Array ('label' => 'la_product_downloadable', 'on_sql' => '', 'off_sql' => '%1$s.Type != 4' ),~~ ~~- 'show_package' => Array ('label' => 'la_product_package', 'on_sql' => '', 'off_sql' => '%1$s.Type != 5' ),~~ ~~- 's2' => Array (),~~ ~~- 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ),~~ ~~- 'show_hot' => Array ('label' => 'la_Text_TopSellers', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ),~~ ~~- 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ),~~ ~~- 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ),~~ ~~- )~~ ~~- ),~~ + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), + ), + 'Filters' => Array ( + 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ), + 'show_hot' => Array ('label' => 'la_Text_TopSellers', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ), + 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ), + 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ), + ) + ), ~~- 'TableName' => TABLE_PREFIX.'Products',~~ + 'TableName' => TABLE_PREFIX . 'Products', + 'CalculatedFields' => Array ( '' => Array ( 'AltName' => 'img.AltName', Index: in-commerce/units/reports/reports_config.php =================================================================== --- in-commerce/units/reports/reports_config.php (revision 13931) +++ in-commerce/units/reports/reports_config.php (working copy) @@ -69,33 +69,16 @@ ), ), ~~- 'FilterMenu' => Array(~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER),~~ ~~- Array('mode' => 'AND', 'filters' => Array(4,5,6), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array(~~ ~~- 0 => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Status != 1' ),~~ ~~- 1 => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => 'Status != 2' ),~~ ~~- 2 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0' ),~~ ~~- 3 => Array(),~~ ~~- 4 => Array('label' => 'la_Flat', 'on_sql' => '', 'off_sql' => 'Type != 1' ),~~ ~~- 5 => Array('label' => 'la_Percent', 'on_sql' => '', 'off_sql' => 'Type != 2' ),~~ ~~- 6 => Array('label' => 'la_FreeShipping', 'on_sql' => '', 'off_sql' => 'Type != 3' ),~~ ~~- )~~ ~~- ),~~ - 'ListSQLs' => Array( '' => 'SELECT %1$s.* %2$s FROM %1$s', ), // key - special, value - list select sql 'ItemSQLs' => Array( '' => 'SELECT * FROM %1$s', ), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('Name' => 'asc'), + ) + ), ~~- 'ListSortings' => Array(~~ ~~- '' => Array(~~ ~~- 'Sorting' => Array('Name' => 'asc'),~~ ~~- )~~ ~~- ),~~ - 'CalculatedFields' => Array ( '' => Array ( 'CategoryId' => '0', Index: in-commerce/units/shipping/shipping_config.php =================================================================== --- in-commerce/units/shipping/shipping_config.php (revision 13931) +++ in-commerce/units/shipping/shipping_config.php (working copy) @@ -118,25 +118,16 @@ 'SubItems' => Array ('z', 'br'), ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array (~~ ~~- 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- )~~ ~~- ),~~ - 'ListSQLs' => Array ( '' => 'SELECT * FROM %s'), // key - special, value - list select sql 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s'), 'ListSortings' => Array ( ~~- '' => Array (~~ ~~- 'Sorting' => Array ('Name' => 'asc'),~~ ~~- )~~ ~~- ),~~ + '' => Array ( + 'Sorting' => Array ('Name' => 'asc'), + ) + ), + 'Fields' => Array ( 'ShippingID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Code' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>25, 'error_msgs' => Array ('required' => 'Please fill in')), Index: in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php =================================================================== --- in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (revision 13931) +++ in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (working copy) @@ -67,25 +67,16 @@ 'TableName' => TABLE_PREFIX.'ShippingQuoteEngines', ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array (~~ ~~- 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- )~~ ~~- ),~~ - 'ListSQLs' => Array ( '' => 'SELECT * FROM %s'), // key - special, value - list select sql 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s'), 'ListSortings' => Array ( ~~- '' => Array (~~ ~~- 'Sorting' => Array ('Name' => 'asc'),~~ ~~- )~~ ~~- ),~~ + '' => Array ( + 'Sorting' => Array ('Name' => 'asc'), + ) + ), + 'Fields' => Array ( 'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), Index: in-link/admin_templates/link_validation/link_validation_list.tpl =================================================================== --- in-link/admin_templates/link_validation/link_validation_list.tpl (revision 13931) +++ in-link/admin_templates/link_validation/link_validation_list.tpl (working copy) @@ -127,7 +127,7 @@ </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="link-validation" IdField="ForeignLinkId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="link-validation" IdField="ForeignLinkId" grid="Default"/> <script type="text/javascript"> Grids['link-validation'].SetDependantToolbarButtons( new Array('validate', 'validate_reset', 'edit', 'approve', 'decline', 'delete') ); </script> Index: in-link/admin_templates/links/links_files.tpl =================================================================== --- in-link/admin_templates/links/links_files.tpl (revision 13931) +++ in-link/admin_templates/links/links_files.tpl (working copy) @@ -78,7 +78,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="l-file" IdField="FileId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="l-file" IdField="FileId" grid="Default"/> <script type="text/javascript"> Grids['l-file'].SetDependantToolbarButtons( new Array('edit','delete') ); </script> Index: in-link/admin_templates/links/links_images.tpl =================================================================== --- in-link/admin_templates/links/links_images.tpl (revision 13931) +++ in-link/admin_templates/links/links_images.tpl (working copy) @@ -99,7 +99,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="l-img" IdField="ImageId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="l-img" IdField="ImageId" grid="Default"/> <script type="text/javascript"> Grids['l-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') ); </script> Index: in-link/admin_templates/links/links_relations.tpl =================================================================== --- in-link/admin_templates/links/links_relations.tpl (revision 13931) +++ in-link/admin_templates/links/links_relations.tpl (working copy) @@ -92,7 +92,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="l-rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="l-rel" IdField="RelationshipId" grid="Default"/> <script type="text/javascript"> Grids['l-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') ); </script> Index: in-link/admin_templates/links/links_reviews.tpl =================================================================== --- in-link/admin_templates/links/links_reviews.tpl (revision 13931) +++ in-link/admin_templates/links/links_reviews.tpl (working copy) @@ -106,7 +106,7 @@ <inp2:Field field="$field" no_special="no_special" cut_first="100"/> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="l-rev" IdField="ReviewId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="l-rev" IdField="ReviewId" grid="Default"/> <script type="text/javascript"> Grids['l-rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') ); </script> Index: in-link/admin_templates/paid_listings/paid_listings_list.tpl =================================================================== --- in-link/admin_templates/paid_listings/paid_listings_list.tpl (revision 13931) +++ in-link/admin_templates/paid_listings/paid_listings_list.tpl (working copy) @@ -67,7 +67,7 @@ <a href="<inp2:LinkEditLink edit_template="in-link/links/links_edit"/>"><inp2:Field name="$field" /></a> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="ls" IdField="ListingId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="ls" IdField="ListingId" grid="Default"/> <script type="text/javascript"> Grids['ls'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') ); </script> Index: in-link/units/link_validation/link_validation_config.php =================================================================== --- in-link/units/link_validation/link_validation_config.php (revision 13931) +++ in-link/units/link_validation/link_validation_config.php (working copy) @@ -73,18 +73,6 @@ ), ), ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array(~~ ~~- Array('mode' => 'AND', 'filters' => Array('show_valid', 'show_invalid', 'show_not_validated'), 'type' => WHERE_FILTER),~~ ~~- ),~~ - ~~- 'Filters' => Array (~~ ~~- 'show_valid' => Array ('label' =>'la_Text_Valid', 'on_sql' => '', 'off_sql' => '%1$s.ValidationStatus != ' . LINK_VALIDATION_VALID . ' OR %1$s.ValidationStatus IS NULL'),~~ ~~- 'show_invalid' => Array ('label' => 'la_Text_Invalid', 'on_sql' => '', 'off_sql' => '%1$s.ValidationStatus != ' . LINK_VALIDATION_INVALID . ' OR %1$s.ValidationStatus IS NULL'),~~ - 'show_not_validated' => Array ('label' => 'la_Text_Not_Validated', 'on_sql' => '', 'off_sql' => '%1$s.ValidationStatus != ' . LINK_VALIDATION_NOT_VALIDATED . ' OR %1$s.ValidationStatus IS NOT NULL'), ~~- )~~ ~~- ),~~ - 'ListSQLs' => Array ( '' => ' SELECT %1$s.* %2$s FROM ' . TABLE_PREFIX . 'Link l Index: in-link/units/links/links_config.php =================================================================== --- in-link/units/links/links_config.php (revision 13931) +++ in-link/units/links/links_config.php (working copy) @@ -377,24 +377,19 @@ ), 'FilterMenu' => Array ( ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array (~~ ~~- 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- 's1' => Array (),~~ ~~- 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ),~~ ~~- 'show_hot' => Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ),~~ ~~- 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ),~~ ~~- 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ),~~ ~~- )~~ ~~- ),~~ + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), + ), + 'Filters' => Array ( + 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ), + 'show_hot' => Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ), + 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ), + 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ), + ), + ), 'TableName' => TABLE_PREFIX.'Link', Index: in-link/units/listings/listings_config.php =================================================================== --- in-link/units/listings/listings_config.php (revision 13931) +++ in-link/units/listings/listings_config.php (working copy) @@ -147,20 +147,6 @@ 'LinkOwner' => Array ('type' => 'string'), ), ~~- 'FilterMenu' => Array (~~ ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array (0,1,2), 'type' => WHERE_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array (3), 'type' => WHERE_FILTER),~~ ~~- ),~~ - ~~- 'Filters' => Array (~~ ~~- 0 => Array ('label' => 'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 1 => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- 2 => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ),~~ ~~- 3 => Array ('label' => 'la_PendingRenewal', 'on_sql' => '', 'off_sql' => '%1$s.PendingRenewal != 1' ),~~ ~~- )~~ ~~- ),~~ - 'Grids' => Array ( 'Default' => Array ( 'Icons' => Array ( Index: in-news/admin_templates/articles/articles_files.tpl =================================================================== --- in-news/admin_templates/articles/articles_files.tpl (revision 13931) +++ in-news/admin_templates/articles/articles_files.tpl (working copy) @@ -78,7 +78,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="n-file" IdField="FileId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="n-file" IdField="FileId" grid="Default"/> <script type="text/javascript"> Grids['n-file'].SetDependantToolbarButtons( new Array('edit','delete') ); </script> Index: in-news/admin_templates/articles/articles_images.tpl =================================================================== --- in-news/admin_templates/articles/articles_images.tpl (revision 13931) +++ in-news/admin_templates/articles/articles_images.tpl (working copy) @@ -99,7 +99,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="n-img" IdField="ImageId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="n-img" IdField="ImageId" grid="Default"/> <script type="text/javascript"> Grids['n-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') ); </script> Index: in-news/admin_templates/articles/articles_relations.tpl =================================================================== --- in-news/admin_templates/articles/articles_relations.tpl (revision 13931) +++ in-news/admin_templates/articles/articles_relations.tpl (working copy) @@ -92,7 +92,7 @@ </tbody> </table> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="n-rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="n-rel" IdField="RelationshipId" grid="Default"/> <script type="text/javascript"> Grids['n-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') ); </script> Index: in-news/admin_templates/articles/articles_reviews.tpl =================================================================== --- in-news/admin_templates/articles/articles_reviews.tpl (revision 13931) +++ in-news/admin_templates/articles/articles_reviews.tpl (working copy) @@ -106,7 +106,7 @@ <inp2:Field field="$field" no_special="no_special" cut_first="100"/> </inp2:m_DefineElement> ~~-<inp2:m_RenderElement name="grid" PrefixSpecial="n-rev" IdField="ReviewId" grid="Default" menu_filters="yes"/>~~ +<inp2:m_RenderElement name="grid" PrefixSpecial="n-rev" IdField="ReviewId" grid="Default"/> <script type="text/javascript"> Grids['n-rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') ); </script> Index: in-news/units/articles/articles_config.php =================================================================== --- in-news/units/articles/articles_config.php (revision 13931) +++ in-news/units/articles/articles_config.php (working copy) @@ -285,24 +285,19 @@ ), 'FilterMenu' => Array ( ~~- 'Groups' => Array (~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),~~ ~~- Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER),~~ ~~- ),~~ ~~- 'Filters' => Array (~~ ~~- 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),~~ ~~- 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ),~~ ~~- 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),~~ ~~- 's1' => Array (),~~ ~~- 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ),~~ ~~- 'show_hot' => Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ),~~ ~~- 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ),~~ ~~- 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ),~~ ~~- )~~ ~~- ),~~ + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), + ), + 'Filters' => Array ( + 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ), + 'show_hot' => Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ), + 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ), + 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ), + ), + ), 'CatalogSelectorName' => 'newslist',

Issue History
Date Modified	Username	Field	Change
2010-11-30 12:48	Dmitry	Note Added: 0003034
2010-11-30 12:48	Dmitry	Status	resolved => closed
2010-09-14 04:16	alex	Note Added: 0002827
2010-09-14 04:16	alex	Status	reviewed and tested => resolved
2010-09-14 04:16	alex	Fixed in Version	=> 5.1.1-B1
2010-09-14 04:16	alex	Resolution	open => fixed
2010-09-14 04:16	alex	Assigned To	!COMMUNITY => alex
2010-09-14 04:16	alex	Changeset attached	5.1.x r13941
2010-09-14 04:15	alex	Changeset attached	5.1.x r13940
2010-09-14 04:14	alex	Changeset attached	5.1.x r13939
2010-09-14 04:12	alex	Changeset attached	5.1.x r13938
2010-09-14 04:11	alex	Changeset attached	5.1.x r13937
2010-09-14 04:10	alex	Note Added: 0002826
2010-09-14 04:10	alex	Assigned To	alex => !COMMUNITY
2010-09-14 04:10	alex	Status	needs testing => reviewed and tested
2010-09-10 17:07	Dmitry	Note Added: 0002807
2010-09-10 17:07	Dmitry	Assigned To	Dmitry => alex
2010-09-10 17:07	Dmitry	Developer	=> Dmitry
2010-09-10 17:07	Dmitry	Status	needs work => needs testing
2010-09-10 17:06	Dmitry	File Added: View-Menu-Cleanup-MODULES.patch
2010-09-10 17:05	Dmitry	File Added: View-Menu-Cleanup-CORE.patch
2010-09-01 16:23	Dmitry	Note Added: 0002762
2010-09-01 16:23	Dmitry	Assigned To	=> Dmitry
2010-09-01 16:23	Dmitry	Status	active => needs work
2010-09-01 15:51	alex	Additional Information Updated	View Revisions
2010-09-01 03:32	alex	Note Added: 0002760
2010-09-01 03:32	alex	Target Version	Icebox => 5.1.1
2010-09-01 03:31	alex	Additional Information Updated	View Revisions
2010-05-23 11:14	alex	New Issue
2010-05-23 11:14	alex	Reference	=> http://groups.google.com/group/in-portal-dev/browse_thread/thread/1d11a3fc2f8773ef

Notes
(0002760) alex (manager) 2010-09-01 03:32	Removing is not adding, so it's pretty fast to do -> Moving to 5.1.1

(0002762) Dmitry (manager) 2010-09-01 16:23	I'll take this task.

(0002807) Dmitry (manager) 2010-09-10 17:07	Please review and test. NOTE: some very minor code clean-up has been done in some of Unit Configs on the way.

(0002826) alex (manager) 2010-09-14 04:10	Tested, however some minor issues were found and fixed by me manually: 1. discounts grid: - filter by Status was not deleted - filter by Type field still present in unit config, however it duplicated Type column, that was already displayed before 2. coupons grid: - filter by Status was deleted, but Status column were not added to the grid to compensate that 3. downloadable product files grid: - filter by Status was deleted, but Status column were not added to the grid to compensate that 4. listings grid: - filter by Status was deleted, but Status column were not added to the grid to compensate that 5. categories grid: - filter by Status was deleted, but Status column were not added to the grid to compensate that 6. users/admins grid: - filter by Status was deleted, but Status column were not added to the grid to compensate that

(0002827) alex (manager) 2010-09-14 04:16	Fix committed to 5.1.x branch. Commit Message: 1. Fixes 0000746: Remove useless filters from "View Menu" 2. Commit on behalf of Dmitry

(0003034) Dmitry (manager) 2010-11-30 12:48	Closing released 5.1.1 task.

Related Changesets
In-Portal CMS: 5.1.x r13941 Timestamp: 2010-09-14 04:16:10 Author: alex [ Details ] [ Diff ]	1. Fixes 0000746: Remove useless filters from "View Menu" 2. Commit on behalf of Dmitry
	mod - /in-portal/branches/5.1.x/core/admin_templates/categories/categories_edit_images.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/categories/categories_edit_related_searches.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/categories/categories_edit_relations.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/incs/menu_blocks.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/languages/language_list.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/modules/modules_list.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/regional/languages_edit_email_events.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/regional/languages_list.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/reviews/reviews_tab.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/stylesheets/stylesheets_list.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/themes/themes_list.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/user_selector.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/users/admins_list.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/users/user_edit_images.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/users/user_selector.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/users/users_list.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/categories/categories_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/email_events/email_events_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/files/files_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/images/images_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/languages/languages_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/modules/modules_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/phrases/phrases_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/related_searches/related_searches_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/relationship/relationship_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/reviews/reviews_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/stylesheets/stylesheets_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/themes/themes_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/units/users/users_config.php	[ Diff ] [ File ]

Modules :: In-News: 5.1.x r13940 Timestamp: 2010-09-14 04:15:10 Author: alex [ Details ] [ Diff ]	1. Bug 0000746: Remove useless filters from "View Menu" 2. Commit on behalf of Dmitry
	mod - /modules/in-news/branches/5.1.x/admin_templates/articles/articles_files.tpl	[ Diff ] [ File ]
	mod - /modules/in-news/branches/5.1.x/admin_templates/articles/articles_images.tpl	[ Diff ] [ File ]
	mod - /modules/in-news/branches/5.1.x/admin_templates/articles/articles_relations.tpl	[ Diff ] [ File ]
	mod - /modules/in-news/branches/5.1.x/admin_templates/articles/articles_reviews.tpl	[ Diff ] [ File ]
	mod - /modules/in-news/branches/5.1.x/units/articles/articles_config.php	[ Diff ] [ File ]

Modules :: In-Link: 5.1.x r13939 Timestamp: 2010-09-14 04:14:25 Author: alex [ Details ] [ Diff ]	1. Bug 0000746: Remove useless filters from "View Menu" 2. Commit on behalf of Dmitry
	mod - /modules/in-link/branches/5.1.x/admin_templates/link_validation/link_validation_list.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/admin_templates/links/links_files.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/admin_templates/links/links_images.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/admin_templates/links/links_relations.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/admin_templates/links/links_reviews.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/admin_templates/paid_listings/paid_listings_list.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/units/link_validation/link_validation_config.php	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/units/links/links_config.php	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/units/listings/listings_config.php	[ Diff ] [ File ]

Modules :: In-Commerce: 5.1.x r13938 Timestamp: 2010-09-14 04:12:39 Author: alex [ Details ] [ Diff ]	1. Bug 0000746: Remove useless filters from "View Menu" 2. Commit on behalf of Dmitry
	mod - /w/in-commerce/branches/5.1.x/admin_templates/discounts/coupon_selector.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/discounts/coupons_list.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/discounts/discounts_list.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/discounts/gift_certificate_list.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/orders/orders_search_list.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/payment_type/payment_type_list.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/products/option_combinations.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/products/products_images.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/products/products_packagecontent.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/products/products_relations.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/products/products_reviews.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/shipping/shipping_custom_list.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/shipping/shipping_list.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/units/coupons/coupons_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/units/discounts/discounts_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/units/files/files_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/units/gift_certificates/gift_certificates_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/units/orders/orders_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/units/payment_type/payment_type_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/units/products/products_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/units/reports/reports_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/units/shipping/shipping_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php	[ Diff ] [ File ]

Modules :: In-Bulletin: 5.1.x r13937 Timestamp: 2010-09-14 04:11:00 Author: alex [ Details ] [ Diff ]	1. Bug 0000746: Remove useless filters from "View Menu" 2. Commit on behalf of Dmitry
	mod - /modules/in-bulletin/branches/5.1.x/admin_templates/topics/topics_images.tpl	[ Diff ] [ File ]
	mod - /modules/in-bulletin/branches/5.1.x/admin_templates/topics/topics_relations.tpl	[ Diff ] [ File ]
	mod - /modules/in-bulletin/branches/5.1.x/admin_templates/topics/topics_reviews.tpl	[ Diff ] [ File ]
	mod - /modules/in-bulletin/branches/5.1.x/units/topics/topics_config.php	[ Diff ] [ File ]

Relationships [ Relation Graph ] [ Dependency Graph ]

In-Portal Issue Tracker