Index: branches/5.3.x/core/install/upgrades.sql =================================================================== diff -u -N -r16325 -r16328 --- branches/5.3.x/core/install/upgrades.sql (.../upgrades.sql) (revision 16325) +++ branches/5.3.x/core/install/upgrades.sql (.../upgrades.sql) (revision 16328) @@ -3033,3 +3033,7 @@ l1_HtmlBody = REPLACE(l1_HtmlBody, ' Array ('new_item', 'edit', 'delete', 'dbl-click'), +// 'site_domain_list' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), // General" tab during adding/editing // 'site_domain_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), ); // fields to hide $hidden_fields = Array ( - /*'DomainId', 'DomainName', 'SSLDomainName', 'AdminEmail', 'Country', 'PrimaryLanguageId', 'Languages', 'PrimaryThemeId', 'PrimaryThemeId', 'Themes', 'DomainIPRange', 'ExternalUrl', 'RedirectOnIPMatch', 'Priority', */ + /*'DomainId', 'DomainName', 'SSLDomainName', 'AdminEmail', 'Country', 'PrimaryLanguageId', 'Languages', 'PrimaryThemeId', 'PrimaryThemeId', 'Themes', 'DomainIPRange', 'ExternalUrl', 'RedirectOnIPMatch', 'Priority', 'Status', */ ); // virtual fields to hide @@ -33,7 +33,7 @@ // fields to make required $required_fields = Array ( - /*'DomainId',*/ 'DomainName', /* 'SSLDomainName', 'AdminEmail', 'Country', 'PrimaryLanguageId', 'Languages', 'PrimaryThemeId', 'PrimaryThemeId', 'Themes', 'DomainIPRange', 'ExternalUrl', 'RedirectOnIPMatch', 'Priority', */ + /*'DomainId',*/ 'DomainName', /* 'SSLDomainName', 'AdminEmail', 'Country', 'PrimaryLanguageId', 'Languages', 'PrimaryThemeId', 'PrimaryThemeId', 'Themes', 'DomainIPRange', 'ExternalUrl', 'RedirectOnIPMatch', 'Priority', 'Status', */ ); // virtual fields to make required @@ -48,5 +48,5 @@ // hide columns in grids $hide_columns = Array ( -// 'Default' => Array ('DomainId', 'DomainName', 'SSLDomainName', 'Country', 'PrimaryLanguageId', 'PrimaryThemeId', 'Priority', ), +// 'Default' => Array ('DomainId', 'DomainName', 'SSLDomainName', 'Country', 'PrimaryLanguageId', 'PrimaryThemeId', 'Priority', 'Status'), ); Index: branches/5.3.x/core/admin_templates/site_domains/site_domain_list.tpl =================================================================== diff -u -N -r15483 -r16328 --- branches/5.3.x/core/admin_templates/site_domains/site_domain_list.tpl (.../site_domain_list.tpl) (revision 15483) +++ branches/5.3.x/core/admin_templates/site_domains/site_domain_list.tpl (.../site_domain_list.tpl) (revision 16328) @@ -28,6 +28,18 @@ a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + a_toolbar.AddButton( new ToolBarButton('approve', '', function() { + submit_event('site-domain','OnMassApprove'); + } + ) ); + + a_toolbar.AddButton( new ToolBarButton('decline', '', function() { + submit_event('site-domain','OnMassDecline'); + } + ) ); + + a_toolbar.AddButton( new ToolBarSeparator('sep2') ); + a_toolbar.AddButton( new ToolBarButton('view', '', function() { show_viewmenu(a_toolbar,'view'); } @@ -41,8 +53,24 @@ - + + + + + row-disabled + + + + Index: branches/5.3.x/core/install/install_schema.sql =================================================================== diff -u -N -r16124 -r16328 --- branches/5.3.x/core/install/install_schema.sql (.../install_schema.sql) (revision 16124) +++ branches/5.3.x/core/install/install_schema.sql (.../install_schema.sql) (revision 16328) @@ -1360,6 +1360,7 @@ ExternalUrl varchar(255) NOT NULL DEFAULT '', RedirectOnIPMatch tinyint(4) NOT NULL DEFAULT '0', Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '1', PRIMARY KEY (DomainId), KEY DomainName (DomainName), KEY DomainNameUsesRegExp (DomainNameUsesRegExp), @@ -1373,7 +1374,8 @@ KEY Themes (Themes), KEY ExternalUrl (ExternalUrl), KEY RedirectOnIPMatch (RedirectOnIPMatch), - KEY Priority (Priority) + KEY Priority (Priority), + KEY `Status` (`Status`) ); CREATE TABLE CurlLog ( Index: branches/5.3.x/core/units/site_domains/site_domain_eh.php =================================================================== diff -u -N -r15999 -r16328 --- branches/5.3.x/core/units/site_domains/site_domain_eh.php (.../site_domain_eh.php) (revision 15999) +++ branches/5.3.x/core/units/site_domains/site_domain_eh.php (.../site_domain_eh.php) (revision 16328) @@ -1,6 +1,6 @@ getObject(); + + if ( !$object->IsTempTable() ) { + $this->_deleteCache(); + } + } + + /** * Deletes site domain cache * * @param kEvent $event Index: branches/5.3.x/core/admin_templates/site_domains/site_domain_edit.tpl =================================================================== diff -u -N -r15999 -r16328 --- branches/5.3.x/core/admin_templates/site_domains/site_domain_edit.tpl (.../site_domain_edit.tpl) (revision 15999) +++ branches/5.3.x/core/admin_templates/site_domains/site_domain_edit.tpl (.../site_domain_edit.tpl) (revision 16328) @@ -89,6 +89,7 @@ + Index: branches/5.3.x/core/units/helpers/site_helper.php =================================================================== diff -u -N -r15999 -r16328 --- branches/5.3.x/core/units/helpers/site_helper.php (.../site_helper.php) (revision 15999) +++ branches/5.3.x/core/units/helpers/site_helper.php (.../site_helper.php) (revision 16328) @@ -1,6 +1,6 @@ Conn->Query($sql, 'DomainId'); Index: branches/5.3.x/core/units/site_domains/site_domains_config.php =================================================================== diff -u -N -r15999 -r16328 --- branches/5.3.x/core/units/site_domains/site_domains_config.php (.../site_domains_config.php) (revision 15999) +++ branches/5.3.x/core/units/site_domains/site_domains_config.php (.../site_domains_config.php) (revision 16328) @@ -1,6 +1,6 @@ 'DomainId', + 'StatusField' => array('Status'), 'TableName' => TABLE_PREFIX . 'SiteDomains', @@ -44,7 +45,7 @@ 'site_domain_list' => Array ( 'prefixes' => Array ('site-domain_List'), 'format' => "!la_title_SiteDomains!", - 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), ), 'site_domain_edit' => Array ( @@ -138,11 +139,23 @@ 'not_null' => 1, 'default' => 0 ), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Status' => array( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => array( + STATUS_ACTIVE => 'la_Enabled', + STATUS_DISABLED => 'la_Disabled', + ), 'use_phrases' => 1, + 'not_null' => 1, 'required' => 1, 'default' => STATUS_ACTIVE, + ), ), 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_item.png'), + 'Icons' => Array( + 'default' => 'icon16_item.png', + STATUS_DISABLED => 'icon16_disabled.png', + STATUS_ACTIVE => 'icon16_item.png', + ), 'Fields' => Array ( 'DomainId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), 'DomainName' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ), @@ -151,7 +164,8 @@ 'PrimaryLanguageId' => Array ('title' => 'column:la_fld_Language', 'filter_block' => 'grid_options_filter', 'width' => 250, ), 'PrimaryThemeId' => Array ('title' => 'column:la_fld_Theme', 'filter_block' => 'grid_options_filter', 'width' => 250, ), 'Priority' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ), + 'Status' => array('filter_block' => 'grid_options_filter'), ), ), ), -); \ No newline at end of file +);