From 6a64818855e9d9a2f4f6cda0a60eac16e386566b Mon Sep 17 00:00:00 2001
From: Bob Le Bricodeur <mr.bricodage@gmail.com>
Date: Thu, 15 Feb 2018 15:12:59 +0100
Subject: [PATCH 1/5] remove RRR label on tc Search

---
 lib/testcases/tcSearch.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/testcases/tcSearch.php b/lib/testcases/tcSearch.php
index c30b4e4673..43930ce47c 100644
--- a/lib/testcases/tcSearch.php
+++ b/lib/testcases/tcSearch.php
@@ -71,7 +71,6 @@
   }
   else
   {
-    echo 'RRR';
     $tproject_mgr->get_all_testcases_id($args->tprojectID,$a_tcid);
 
     if(!is_null($a_tcid))

From c13d4a2ade2ede46fde5b03bf603d99ccd488466 Mon Sep 17 00:00:00 2001
From: Bob Le Bricodeur <mr.bricodage@gmail.com>
Date: Thu, 15 Feb 2018 15:24:51 +0100
Subject: [PATCH 2/5] Add missing label for expiration date

---
 locale/en_GB/strings.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locale/en_GB/strings.txt b/locale/en_GB/strings.txt
index ebcbae7616..9ca7c635e2 100644
--- a/locale/en_GB/strings.txt
+++ b/locale/en_GB/strings.txt
@@ -2170,6 +2170,7 @@ $TLS_th_password = "Password";
 $TLS_warning_empty_first_name = "Please enter a name";
 $TLS_warning_empty_last_name = "Please enter a surname";
 $TLS_warning_empty_login = "Please enter a login";
+$TLS_expiration_date = "Expiration date";
 
 // usersExport.php
 $TLS_export_users = "Export users";

From 4047e41dc04d317bd44604b524ae70a6148ff202 Mon Sep 17 00:00:00 2001
From: Bob Le Bricodeur <mr.bricodage@gmail.com>
Date: Thu, 15 Feb 2018 15:39:42 +0100
Subject: [PATCH 3/5] Add french translation for TC viewer

---
 locale/fr_FR/strings.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locale/fr_FR/strings.txt b/locale/fr_FR/strings.txt
index eccf6d893a..66aa895c8f 100644
--- a/locale/fr_FR/strings.txt
+++ b/locale/fr_FR/strings.txt
@@ -727,6 +727,7 @@ $TLS_title_change_node_order = "Modifier l’ordre des éléments enfants";
 // ----- gui/templates/containerView.tpl -----
 $TLS_testsuite_operations = "Opérations sur les dossiers de tests";
 $TLS_testcase_operations = "Opérations sur les fiches de test";
+$TLS_testcase_version_operations = "Opérations sur les versions de la fiche de test";
 $TLS_alt_del_testsuite = "Supprimer le dossier de tests avec tous les dossiers et fiches de test enfants";
 $TLS_alt_edit_testsuite = "Modifier les données et titre du dossier de tests";
 $TLS_alt_move_cp_testsuite = "Déplacer ou copier le dossier de tests vers un autre projet";

From 971825502a7386db713e298d720ba99657160f69 Mon Sep 17 00:00:00 2001
From: Bob Le Bricodeur <mr.bricodage@gmail.com>
Date: Fri, 16 Feb 2018 00:15:05 +0100
Subject: [PATCH 4/5] Review Assigned to filter in exec mode

Remove unassigned testcases checkbox.
Advanced filters with nobody selected provide the data
---
 gui/templates/inc_filter_panel.tpl              | 11 -----------
 lib/functions/tlTestCaseFilterControl.class.php |  8 +++++---
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/gui/templates/inc_filter_panel.tpl b/gui/templates/inc_filter_panel.tpl
index 246b9e995d..678fc63f3a 100644
--- a/gui/templates/inc_filter_panel.tpl
+++ b/gui/templates/inc_filter_panel.tpl
@@ -370,17 +370,6 @@
                               selected=$control->filters.filter_assigned_user.selected}
         </select>
 
-        <br/>
-        <br />
-        <input type="checkbox"
-               id="filter_assigned_user_include_unassigned"
-               name="filter_assigned_user_include_unassigned"
-                   value="1"
-                   {if $control->filters.filter_assigned_user.filter_assigned_user_include_unassigned}
-                      checked="checked"
-                   {/if}
-            />
-        {$labels.include_unassigned_testcases}
       {/if}
 
       </td>
diff --git a/lib/functions/tlTestCaseFilterControl.class.php b/lib/functions/tlTestCaseFilterControl.class.php
index 089cf4917a..d5f5ac5f21 100644
--- a/lib/functions/tlTestCaseFilterControl.class.php
+++ b/lib/functions/tlTestCaseFilterControl.class.php
@@ -1791,10 +1791,12 @@ private function init_filter_assigned_user()
       }
 
       $view_mode = $simple ? $this->configuration->exec_cfg->view_mode->tester : 'all';
-      
       if ($view_mode != 'all') {
-        $visible_testers = (array)$this->user->getDisplayName();
-        $selection = (array)$this->user->dbID;
+        $visible_testers = array(TL_USER_NOBODY => $this->option_strings['none'],
+								$this->user->dbID => $this->user->getDisplayName());
+        if($selection == null){
+		  $selection = (array)$this->user->dbID;
+		}
       }
 
       // re-enable option "user_filter_default"

From b6bb122b63ac63dc2e51f8eb57eec6199af7e8a1 Mon Sep 17 00:00:00 2001
From: Bob Le Bricodeur <mr.bricodage@gmail.com>
Date: Thu, 22 Feb 2018 00:06:04 +0100
Subject: [PATCH 5/5] remove include_unassigned checkbox

---
 gui/templates/inc_filter_panel.tpl            |  3 +--
 gui/templates/inc_filter_panel_js.tpl         | 14 ++--------
 lib/execute/execSetResults.php                |  4 ---
 lib/functions/execTreeMenu.inc.php            |  2 --
 lib/functions/testplan.class.php              | 16 +++++------
 ...stCaseFilterByRequirementControl.class.php | 10 ++-----
 .../tlTestCaseFilterControl.class.php         | 27 +++++--------------
 7 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/gui/templates/inc_filter_panel.tpl b/gui/templates/inc_filter_panel.tpl
index 678fc63f3a..04f1fcb7fc 100644
--- a/gui/templates/inc_filter_panel.tpl
+++ b/gui/templates/inc_filter_panel.tpl
@@ -20,7 +20,7 @@
                         build,filter_tcID,filter_on,filter_result,status,
                         btn_update_menu,btn_apply_filter,keyword,keywords_filter_help,
                         filter_owner,TestPlan,test_plan,caption_nav_filters,
-                        platform, include_unassigned_testcases, filter_active_inactive,
+                        platform, filter_active_inactive,
                         btn_remove_all_tester_assignments, execution_type, 
                         do_auto_update, testsuite, btn_reset_filters,hint_list_of_bugs,
                         btn_bulk_update_to_latest_version, priority, tc_title,
@@ -362,7 +362,6 @@
         <select class="chosen-select" name="filter_assigned_user" 
                 id="filter_assigned_user"
                 onchange="javascript: triggerAssignedBox('filter_assigned_user',
-                                                               'filter_assigned_user_include_unassigned',
                                                                '{$control->option_strings.any}',
                                                                '{$control->option_strings.none}',
                                                                '{$control->option_strings.somebody}');">
diff --git a/gui/templates/inc_filter_panel_js.tpl b/gui/templates/inc_filter_panel_js.tpl
index 1813711e91..78b76c1a0c 100644
--- a/gui/templates/inc_filter_panel_js.tpl
+++ b/gui/templates/inc_filter_panel_js.tpl
@@ -25,24 +25,15 @@
    * 
    * @author Andreas Simon
    * @param filter_assigned_to combobox in which assignment is chosen
-   * @param include_unassigned checkbox for including unassigned testcases
    * @param str_option_any string value anybody
    * @param str_option_none string value nobody
    * @param str_option_somebody string value somebody
    */
-  function triggerAssignedBox(filter_assigned_to_id, include_unassigned_id,
-                              str_option_any, str_option_none, str_option_somebody) 
+  function triggerAssignedBox(filter_assigned_to_id, str_option_any, str_option_none, str_option_somebody) 
   {
     var filter_assigned_to = document.getElementById(filter_assigned_to_id);
-    var include_unassigned = document.getElementById(include_unassigned_id);
     var index = filter_assigned_to.options.selectedIndex;
-    var choice = filter_assigned_to.options[index].label;
-    include_unassigned.disabled = false;
-    if (choice == str_option_any || choice == str_option_none || choice == str_option_somebody) 
-    {
-      include_unassigned.disabled = true;
-      include_unassigned.checked = false;
-    } 
+    var choice = filter_assigned_to.options[index].label; 
   }
 {/if}
 
@@ -146,7 +137,6 @@ function copy_tester_assignments_from_build(destination)
     
     {if $control->filters.filter_assigned_user}
       triggerAssignedBox('filter_assigned_user',
-                         'filter_assigned_user_include_unassigned',
                          '{$control->option_strings.any}',
                          '{$control->option_strings.none}',
                          '{$control->option_strings.somebody}');
diff --git a/lib/execute/execSetResults.php b/lib/execute/execSetResults.php
index 6a53d5863d..5e3ee36463 100644
--- a/lib/execute/execSetResults.php
+++ b/lib/execute/execSetResults.php
@@ -2112,10 +2112,6 @@ function getSettingsAndFilters(&$argsObj)
 
   $argsObj->refreshTree = isset($sf['setting_refresh_tree_on_action']) ? 
                                 $sf['setting_refresh_tree_on_action'] : null;
-                                  
-  // Checkbox
-  $tgk = 'filter_assigned_user_include_unassigned';
-  $argsObj->include_unassigned = isset($sf[$tgk]) && ($sf[$tgk] != 0 ? 1 : 0);
 }
 
 
diff --git a/lib/functions/execTreeMenu.inc.php b/lib/functions/execTreeMenu.inc.php
index f32f371db0..612db7aa70 100644
--- a/lib/functions/execTreeMenu.inc.php
+++ b/lib/functions/execTreeMenu.inc.php
@@ -349,8 +349,6 @@ function initExecTree($filtersObj,$optionsObj)
   $options['hideTestCases'] = isset($optionsObj->hideTestCases) ?
                                     $optionsObj->hideTestCases : false;
 
-  $options['include_unassigned'] = isset($filtersObj->filter_assigned_user_include_unassigned) ?
-                                         $filtersObj->filter_assigned_user_include_unassigned : false;
 
   // useful when using tree on set urgent test cases
   $options['allow_empty_build'] = isset($optionsObj->allow_empty_build) ?
diff --git a/lib/functions/testplan.class.php b/lib/functions/testplan.class.php
index 3f1650a4dd..99fa88b7cf 100644
--- a/lib/functions/testplan.class.php
+++ b/lib/functions/testplan.class.php
@@ -975,21 +975,19 @@ function helper_assigned_to_sql($filter,$opt,$build_id)
             " AND UA.type = {$this->execTaskCode} ";
     
     // Warning!!!:
-    // If special user id TL_USER_NOBODY is present in set of user id
-    // we will ignore any other user id present on set.
+    // TL_USER_NOBODY is used to ask for unassigned testcases
     $ff = (array)$filter;
     $sql = " UA.user_id "; 
-    if( in_array(TL_USER_NOBODY,$ff) )
+    if( in_array(TL_USER_SOMEBODY,$ff) )
     {
-      $sql .= " IS NULL "; 
-      $join = ' LEFT OUTER ' . $join;
-    } 
-    else if( in_array(TL_USER_SOMEBODY,$ff) )
-    {
-      $sql .= " IS NOT NULL "; 
+      $sql .= " IS NOT NULL ";
     }
     else
     {
+      if( in_array(TL_USER_NOBODY,$ff) )
+      {
+        $opt['include_unassigned'] = true;
+      } 
       $sql_unassigned="";
       $sql = '';
       if( $opt['include_unassigned'] )
diff --git a/lib/functions/tlTestCaseFilterByRequirementControl.class.php b/lib/functions/tlTestCaseFilterByRequirementControl.class.php
index f8f84a10f1..c2a22fdb7c 100644
--- a/lib/functions/tlTestCaseFilterByRequirementControl.class.php
+++ b/lib/functions/tlTestCaseFilterByRequirementControl.class.php
@@ -632,9 +632,7 @@ public function get_argument_string()
       // Using serialization      
       if ($this->active_filters['filter_assigned_user']) 
       {
-        $string .= '&filter_assigned_user='. json_encode($this->active_filters['filter_assigned_user']) .
-                   '&filter_assigned_user_include_unassigned=' . 
-                   ($this->active_filters['filter_assigned_user_include_unassigned'] ? '1' : '0');
+        $string .= '&filter_assigned_user='. json_encode($this->active_filters['filter_assigned_user']);
       }
       
       if ($this->active_filters['filter_result_result']) 
@@ -1249,7 +1247,6 @@ private function init_filter_assigned_user()
     }
 
     $key = 'filter_assigned_user';
-    $unassigned_key = 'filter_assigned_user_include_unassigned';
     $tplan_id = $this->settings['setting_testplan']['selected'];
 
     // set selection to default (any), only change if value is sent by user and reset is not requested
@@ -1300,8 +1297,7 @@ private function init_filter_assigned_user()
     }
     
     $this->filters[$key] = array('items' => $visible_testers,
-                                 'selected' => $selection,
-                                 $unassigned_key => $this->args->{$unassigned_key});
+                                 'selected' => $selection);
     
     // which value shall be passed to tree generation class?
     
@@ -1309,7 +1305,6 @@ private function init_filter_assigned_user()
     || ($selection == TL_USER_ANYBODY)) {
       // delete user assignment filter if "any user" is part of the selection
       $this->active_filters[$key] = null;
-      $this->active_filters[$unassigned_key] = 0;
     }
     
     if (is_array($selection)) {
@@ -1318,7 +1313,6 @@ private function init_filter_assigned_user()
       foreach ($this->active_filters[$key] as $user_key => $user_value) {
         $this->active_filters[$key][$user_key] = $user_key;
       }
-      $this->active_filters[$unassigned_key] = $this->filters[$key][$unassigned_key];
     }
   } // end of method
 
diff --git a/lib/functions/tlTestCaseFilterControl.class.php b/lib/functions/tlTestCaseFilterControl.class.php
index d5f5ac5f21..13501f7603 100644
--- a/lib/functions/tlTestCaseFilterControl.class.php
+++ b/lib/functions/tlTestCaseFilterControl.class.php
@@ -76,7 +76,6 @@
  *         [filter_result_result] => f                    // prefixed with "filter_" and "setting_"
  *         [filter_result_method] => 3
  *         [filter_result_build] => 71
- *         [filter_assigned_user_include_unassigned] => 1
  *         [filter_testcase_name] => 
  *         [filter_toplevel_testsuite] => Array
  *           (
@@ -486,9 +485,6 @@ protected function init_args()
       $this->args->{$ek} = (isset($_REQUEST[$ek])) ? $_REQUEST[$ek] : null;
     }
 
-    $this->args->{'filter_assigned_user_include_unassigned'} = 
-      isset($_REQUEST['filter_assigned_user_include_unassigned']) ? 1 : 0;
-
     // got session token sent by form or do we have to generate a new one?
     $sent_token = null;
     $this->args->form_token = null;
@@ -606,8 +602,7 @@ protected function init_filters()
     // In resulting data structure, all values have to be defined (at least initialized),
     // no matter wether they are wanted for filtering or not.
     $dummy = array('filter_keywords_filter_type','filter_result_result',
-                   'filter_result_method','filter_result_build',
-                   'filter_assigned_user_include_unassigned');
+                   'filter_result_method','filter_result_build');
     
     foreach ($dummy as $filtername) 
     {
@@ -862,9 +857,7 @@ public function get_argument_string()
       // Using serialization      
       if ($this->active_filters['filter_assigned_user']) 
       {
-        $string .= '&filter_assigned_user='. json_encode($this->active_filters['filter_assigned_user']) .
-                   '&filter_assigned_user_include_unassigned=' . 
-                   ($this->active_filters['filter_assigned_user_include_unassigned'] ? '1' : '0');
+        $string .= '&filter_assigned_user='. json_encode($this->active_filters['filter_assigned_user']);
       }
       
       if ($this->active_filters['filter_result_result']) 
@@ -1753,7 +1746,6 @@ private function init_filter_assigned_user()
     }
 
     $key = 'filter_assigned_user';
-    $unassigned_key = 'filter_assigned_user_include_unassigned';
     $tplan_id = $this->settings['setting_testplan']['selected'];
 
     // set selection to default (any), only change if value is sent by user and reset is not requested
@@ -1803,28 +1795,23 @@ private function init_filter_assigned_user()
       if (!$selection && $this->configuration->exec_cfg->user_filter_default == 'logged_user') {
         $selection = (array)$this->user->dbID;
       }
+
     }
-    
     $this->filters[$key] = array('items' => $visible_testers,
-                                 'selected' => $selection,
-                                 $unassigned_key => $this->args->{$unassigned_key});
-    
+                                 'selected' => $selection);
     // which value shall be passed to tree generation class?
-    
     if ((is_array($selection) && in_array(TL_USER_ANYBODY, $selection))
+	|| (is_array($selection) && in_array(TL_USER_NOBODY, $selection) && in_array(TL_USER_SOMEBODY, $selection))
     || ($selection == TL_USER_ANYBODY)) {
-      // delete user assignment filter if "any user" is part of the selection
+      // delete user assignment filter if "any user" is part of the selection or if SOMEBODY + NOBODY are selected
       $this->active_filters[$key] = null;
-      $this->active_filters[$unassigned_key] = 0;
     }
-    
-    if (is_array($selection)) {
+    elseif (is_array($selection)) {
       // get keys of the array as values
       $this->active_filters[$key] = array_flip($selection);
       foreach ($this->active_filters[$key] as $user_key => $user_value) {
         $this->active_filters[$key][$user_key] = $user_key;
       }
-      $this->active_filters[$unassigned_key] = $this->filters[$key][$unassigned_key];
     }
   } // end of method