-
Notifications
You must be signed in to change notification settings - Fork 622
Integration #18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
LeJonPPI
wants to merge
13
commits into
TestLinkOpenSourceTRMS:testlink_1_9
Choose a base branch
from
LeJonPPI:integration
base: testlink_1_9
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Integration #18
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
1fa5168
Implementation of the email-alert on requirement state change.
LeJonPPI 6df8838
adding the table creation to the install script and solving minor syn…
LeJonPPI d8e411c
Minor bugfixes.
LeJonPPI 369c0d2
log commands removed.
LeJonPPI 445e141
Merge branch 'testlink_1_9' of https://github.com/TestLinkOpenSourceT…
LeJonPPI 2813eca
build the subscription mechanisms for requirements (see mantis id 000…
LeJonPPI c13b630
notification for subbed users on requirement delete, change, version …
LeJonPPI 0109372
develp a new user interface to handle requirement subscribtions
LeJonPPI 8f2e21f
removing import of custom_config.php
LeJonPPI 59055d9
code refactroing after initial merge request
LeJonPPI 67b5bed
implementation of the subscibtion management view.
LeJonPPI b22b915
changes after merge
LeJonPPI d7b1899
enable the assignment of multiple people to a process step
LeJonPPI File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You should be more careful when pushing company email server and ports to public. |
||
|
|
||
| # 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 | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. no unread mails, everything is fine |
||
| //$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; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| {lang_get var='labels' | ||
| s='test_project_names,assign_button_label,assign_table_header_fieldvals,assign_table_header_users,assign_btn_change,assign_btn_delete'} | ||
|
|
||
| <html> | ||
| <head> | ||
| </head> | ||
| <body> | ||
| {include file="inc_head.tpl" openHead="yes" jsValidate="yes" editorType=$gui->editorType} | ||
| <div class="workBack"> | ||
| <form method="post" action="lib/notificationassignments/notificationAssignmentCreate.php"> | ||
| <script> | ||
| function submitBtnEnablePolicy() { | ||
| var select = document.getElementsByName("fieldName")[0]; | ||
| var changeBtn = document.getElementsByName("change")[0]; | ||
| if(select.options[select.selectedIndex].text.localeCompare("")==0) { | ||
| changeBtn.disabled = true; | ||
| }else { | ||
| changeBtn.disabled = false; | ||
| } | ||
| } | ||
| </script> | ||
| <label for="testProject">{$labels.test_project_names}</label> | ||
| <select name="fieldName" onchange="submitBtnEnablePolicy()"> | ||
| {html_options options=$gui->fieldNames} | ||
| </select> | ||
| <input type="submit" name="change" value="{$labels.assign_button_label}" disabled=true; /> | ||
| </form> | ||
| </div> | ||
| {if isset($gui->assignments)} | ||
| <div class="workBack"> | ||
| {foreach key=fieldName item=fieldValues from=$gui->assignments} | ||
| <div class="workBack"> | ||
| <form method="POST" > | ||
| <h3>{$fieldName}</h3> | ||
| <table class="simple_tableruler"> | ||
| <th>{$labels.assign_table_header_fieldvals}</th><th>{$labels.assign_table_header_users}</th> | ||
| {foreach key=fieldVal item=assignedUsers from=$fieldValues} | ||
| <tr> | ||
| <td>{$fieldVal}</td> | ||
| <td> | ||
| {foreach item=user from=$assignedUsers} | ||
| <a>{$user}<br></a> | ||
| {/foreach} | ||
| </td> | ||
| </tr> | ||
| {/foreach} | ||
| </table> | ||
| <input type="text" name="fieldName" style="display:none" value="{$fieldName}"/> | ||
| <input type="submit" name="change" value="{$labels.assign_btn_change}" formaction="lib/notificationassignments/notificationAssignmentCreate.php" /> | ||
| <input type="submit" name="delete" value="{$labels.assign_btn_delete}" formaction="lib/notificationassignments/notificationAssignmentConfig.php" /> | ||
| </form> | ||
| </div> | ||
| {/foreach} | ||
| </div> | ||
| {/if} | ||
| </body> | ||
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| {lang_get var='labels' | ||
| s='assign_table_header_fieldvals,assign_table_header_users,btn_cancel,btn_ok'} | ||
|
|
||
| <!DOCTYPE html> | ||
| {$selectSize = 10} | ||
| {if count($gui->users) lt 10} | ||
| {$selectSize = count($gui->users)} | ||
| {/if} | ||
| <html> | ||
| <head> | ||
| <link rel="stylesheet" href="../../gui/themes/default/css/testlink.css"/> | ||
| </head> | ||
| <body> | ||
| <div class="workBack"> | ||
| <form id="assignmentForm" method="post" action="notificationAssignmentConfig.php" > | ||
| <input hidden type="text" name="fieldName" value="{$gui->fieldName}"/> | ||
| <table class="simple_tableruler"> | ||
| <th>{$labels.assign_table_header_fieldvals}</th><th>{$labels.assign_table_header_users}</th> | ||
| {foreach key=fieldValNr item=fieldVal from=$gui->fieldVals} | ||
| <tr> | ||
| <td>{$fieldVal}</td> | ||
| <td> | ||
| <select name="select_{$fieldVal}[]" multiple="multiple" size="{$selectSize}"> | ||
| {$addSelectedUser = false} | ||
| {foreach key=userIndex item=userName from=$gui->users} | ||
| {foreach item=activeUser from=$gui->fieldAssignments[$gui->fieldName][$fieldVal]} | ||
| {if strcmp($activeUser,$userName) === 0} | ||
| {$addSelectedUser = true} | ||
| {break} | ||
| {/if} | ||
| {/foreach} | ||
| {if $addSelectedUser} | ||
| <option selected="selected" id={$userIndex}>{$userName}</option> | ||
| {$addSelectedUser = false} | ||
| {else} | ||
| <option id={$userIndex}>{$userName}</option> | ||
| {/if} | ||
| {/foreach} | ||
| </select> | ||
| </td> | ||
| </tr> | ||
| {/foreach} | ||
| </table> | ||
| <input id="assignmentFormSubmit" name="submit" type="submit" value="{$labels.btn_ok}" /> | ||
| <input id="assignmentFormCancel" name="cancel" type="submit" value="{$labels.btn_cancel}" /> | ||
| </form> | ||
| </div> | ||
| </body> | ||
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| {* | ||
| * TestLink Open Source Project - http://testlink.sourceforge.net/ | ||
| * $Id: reqmanagesubs.tpl,v 1.9 2016/22/02 | ||
| * | ||
| * Purpose: List requirements in an ExtJS Table, with the ability to subscribe or unsubscribe requirements. | ||
| * | ||
| * @internal revisions | ||
| * | ||
| *} | ||
|
|
||
| {lang_get var="labels" | ||
| s='testproject_has_no_reqspec, testproject_has_no_requirements, | ||
| all_versions_displayed, latest_version_displayed, | ||
| dont_show_all_versions_btn'} | ||
|
|
||
| {include file="inc_head.tpl" openHead="yes"} | ||
|
|
||
| {foreach from=$gui->tableSet key=idx item=matrix name="initializer"} | ||
| {$tableID="table_$idx"} | ||
| {if $smarty.foreach.initializer.first} | ||
| {$matrix->renderCommonGlobals()} | ||
| {if $matrix instanceof tlExtTable} | ||
| {include file="inc_ext_js.tpl" bResetEXTCss=1} | ||
| {include file="inc_ext_table.tpl"} | ||
| {/if} | ||
| {/if} | ||
| {$matrix->renderHeadSection($tableID)} | ||
| {/foreach} | ||
| </head> | ||
|
|
||
| <body> | ||
| <h1 class="title">{$gui->pageTitle|escape}</h1> | ||
|
|
||
| <div class="workBack" style="overflow-y: auto;"> | ||
|
|
||
| {foreach from=$gui->tableSet key=idx item=matrix} | ||
| {$tableID="table_$idx"} | ||
| {$matrix->renderBodySection($tableID)} | ||
| {/foreach} | ||
|
|
||
| <br/> | ||
|
|
||
| </div> | ||
|
|
||
| </body> | ||
|
|
||
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,4 +68,4 @@ | |
|
|
||
| </body> | ||
|
|
||
| </html> | ||
| </html> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not unix example.