diff --git a/config.inc.php b/config.inc.php index 7c984b5f76..23ca45a585 100644 --- a/config.inc.php +++ b/config.inc.php @@ -185,7 +185,7 @@ * for security reasons (see http://itsecuritysolutions.org/2012-08-13-TestLink-1.9.3-multiple-vulnerabilities/) * put it out of reach via web or configure access denied. */ -$tlCfg->log_path = '/var/testlink/logs/'; /* unix example */ +$tlCfg->log_path = 'C:\xampp\htdocs\new_pull\logs'; /* unix example */ /** @@ -244,7 +244,7 @@ * Configure using custom_config.inc.php * @uses lib/functions/email_api.php */ -$g_smtp_host = '[smtp_host_not_configured]'; # SMTP server MUST BE configured +//$g_smtp_host = 'mail.gmx.de'; # SMTP server MUST BE configured # Configure using custom_config.inc.php $g_tl_admin_email = '[testlink_sysadmin_email_not_configured]'; # for problem/error notification @@ -255,7 +255,7 @@ * Email notification priority (low by default) * Urgent = 1, Not Urgent = 5, Disable = 0 **/ -$g_mail_priority = 5; +//$g_mail_priority = 5; /** * Taken from mantis for phpmailer config @@ -267,22 +267,22 @@ $g_phpMailer_method = PHPMAILER_METHOD_SMTP; /** Configure only if SMTP server requires authentication */ -$g_smtp_username = ''; # user -$g_smtp_password = ''; # password +//$g_smtp_username = 'lion_milka@gmx.de'; # user +//$g_smtp_password = '!234abcD'; # password /** * This control the connection mode to SMTP server. * Can be '', 'ssl','tls' * @global string $g_smtp_connection_mode */ -$g_smtp_connection_mode = ''; +$g_smtp_connection_mode = 'tls'; /** * The smtp port to use. The typical SMTP ports are 25 and 587. The port to use * will depend on the SMTP server configuration and hence others may be used. * @global int $g_smtp_port */ -$g_smtp_port = 25; +$g_smtp_port = 587; // ---------------------------------------------------------------------------- @@ -1111,7 +1111,7 @@ * Put it out of reach via web or configure access denied. * **/ -$g_repositoryPath = '/var/testlink/upload_area/'; /* unix example */ +$g_repositoryPath = 'C:\xampp\htdocs\new_pull\upload_area'; /* unix example */ /** * compression used within the repository @@ -1431,7 +1431,9 @@ $tlCfg->tree_filter_cfg->testcases->edit_mode->filter_execution_type = ENABLED; $tlCfg->tree_filter_cfg->testcases->edit_mode->filter_custom_fields = ENABLED; $tlCfg->tree_filter_cfg->testcases->edit_mode->filter_workflow_status = ENABLED; -$tlCfg->tree_filter_cfg->testcases->edit_mode->advanced_filter_mode_choice = ENABLED; + +// filter mode choice disabled for this mode because there are no filters benefiting from it +$tlCfg->tree_filter_cfg->testcases->edit_mode->advanced_filter_mode_choice = DISABLED; $tlCfg->tree_filter_cfg->testcases->plan_mode->filter_tc_id = ENABLED; diff --git a/gui/templates/mainPageLeft.tpl b/gui/templates/mainPageLeft.tpl index 5e77e40c9e..3e0c58e80e 100644 --- a/gui/templates/mainPageLeft.tpl +++ b/gui/templates/mainPageLeft.tpl @@ -9,8 +9,8 @@ {lang_get var='labels' s='title_product_mgmt,href_tproject_management,href_admin_modules, href_assign_user_roles,href_cfields_management,system_config, href_cfields_tproject_assign,href_keywords_manage, - title_user_mgmt,href_user_management, - href_roles_management,title_requirements, + title_user_mgmt,href_user_management,href_process_step_role_assignment, + href_roles_management,title_requirements,href_manage_req_subs, href_req_spec,href_req_assign,link_report_test_cases_created_per_user, title_test_spec,href_edit_tc,href_browse_tc,href_search_tc, href_search_req, href_search_req_spec,href_inventory, @@ -57,7 +57,7 @@ {if $gui->testprojectID && - ($gui->grants.cfield_management == "yes" || $gui->grants.issuetracker_management || $gui->grants.issuetracker_view)} + ($gui->grants.cfield_management == "yes" || $gui->grants.issuetracker_management || $gui->grants.issuetracker_view || $gui->grants.reqs_view == "yes")} {$display_left_block_2=true} + + + + + + {if isset($gui->assignments)} +