Merge branch 'pu/cw/searchsourceofsource' into '2024.11'

fix(Tinebase): can't search source of source See merge request tine20/tine20!6558
tine-groupware · Feb 7, 2025 · e0acd60 · e0acd60
2 parents b903a4b + 5f26339
commit e0acd60
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/tests/tine20/Projects/JsonTest.php b/tests/tine20/Projects/JsonTest.php
@@ -200,7 +200,7 @@ public function testAddProject()
         $this->assertSame(0, $searchResult['totalcount']);
 
         $searchResult = $tasksFE->searchTasks([
-            ['field' => 'source:Projects_Model_Project', 'operator' => 'definedBy', 'value' => [
+            ['field' => 'source~Projects_Model_Project', 'operator' => 'definedBy', 'value' => [
                 ['field' => 'title', 'operator' => 'equals', 'value' => $projectData['title']],
             ]],
         ], null);
@@ -216,7 +216,7 @@ public function testAddProject()
         ]));
 
         $searchResult = $tasksFE->searchTasks([
-            ['field' => 'source:Projects_Model_Project', 'operator' => 'definedBy', 'value' => [
+            ['field' => 'source~Projects_Model_Project', 'operator' => 'definedBy', 'value' => [
                 ['field' => 'title', 'operator' => 'equals', 'value' => 'titleFOOO'],
             ]],
         ], null);

diff --git a/tine20/Crm/Controller.php b/tine20/Crm/Controller.php
@@ -129,8 +129,8 @@ public static function tasksMCHookFun(array &$fields, Tinebase_ModelConfiguratio
             $fields['source_model'][TMCC::CONFIG][TMCC::AVAILABLE_MODELS][] = Crm_Model_Lead::class;
         }
         $filterModels = $mc->filterModel;
-        if (!isset($filterModels['source:' . Crm_Model_Lead::class])) {
-            $filterModels['source:' . Crm_Model_Lead::class] = [
+        if (!isset($filterModels['source~' . Crm_Model_Lead::class])) {
+            $filterModels['source~' . Crm_Model_Lead::class] = [
                 TMCC::FILTER         => Tinebase_Model_Filter_ForeignId::class,
                 TMCC::OPTIONS => [
                     TMCC::CONTROLLER    => Crm_Controller_Lead::class,

diff --git a/tine20/Projects/Controller.php b/tine20/Projects/Controller.php
@@ -118,8 +118,8 @@ public static function tasksMCHookFun(array &$fields, Tinebase_ModelConfiguratio
             $fields['source_model'][TMCC::CONFIG][TMCC::AVAILABLE_MODELS][] = Projects_Model_Project::class;
         }
         $filterModels = $mc->filterModel;
-        if (!isset($filterModels['source:' . Projects_Model_Project::class])) {
-            $filterModels['source:' . Projects_Model_Project::class] = [
+        if (!isset($filterModels['source~' . Projects_Model_Project::class])) {
+            $filterModels['source~' . Projects_Model_Project::class] = [
                 TMCC::FILTER         => Tinebase_Model_Filter_ForeignId::class,
                 TMCC::OPTIONS => [
                     TMCC::CONTROLLER    => Projects_Controller_Project::class,

diff --git a/tine20/Projects/js/ProjectEditDialog.js b/tine20/Projects/js/ProjectEditDialog.js
@@ -214,7 +214,7 @@ Tine.Projects.ProjectEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
                                 editDialog: this,
                                 filter: [
                                     { field: "tasksDue", operator: "equals", value: "currentContact" },
-                                    { field: "source:Projects_Model_Project", operator: "definedBy?condition=and&setOperator=oneOf", value: [
+                                    { field: "source~Projects_Model_Project", operator: "definedBy?condition=and&setOperator=oneOf", value: [
                                         { field: ":id", operator: "equals", value: new Stringable('...', () => {
                                             return this.record.id;
                                         }) }

diff --git a/tine20/Tasks/Controller.php b/tine20/Tasks/Controller.php
@@ -145,8 +145,8 @@ public static function timesheetMCHookFun(array &$fields, Tinebase_ModelConfigur
             $fields['source_model'][TMCC::CONFIG][TMCC::AVAILABLE_MODELS][] = Tasks_Model_Task::class;
         }
         $filterModels = $mc->filterModel;
-        if (!isset($filterModels['source:' . Tasks_Model_Task::class])) {
-            $filterModels['source:' . Tasks_Model_Task::class] = [
+        if (!isset($filterModels['source~' . Tasks_Model_Task::class])) {
+            $filterModels['source~' . Tasks_Model_Task::class] = [
                 TMCC::FILTER         => Tinebase_Model_Filter_ForeignId::class,
                 TMCC::OPTIONS => [
                     TMCC::CONTROLLER    => Tasks_Controller_Task::class,

diff --git a/tine20/Timetracker/js/Tasks/timeaccountingPanel.js b/tine20/Timetracker/js/Tasks/timeaccountingPanel.js
@@ -70,7 +70,7 @@ Ext.ux.ItemRegistry.registerItem('Tasks-Task-EditDialog-TabPanel',  Ext.extend(E
         const filters = _.get(options.params.filter, '[0].filters[0].filters')
 
         if (!_.find(filters, {field: 'timeaccount_id'})) {
-            filters.push({field: 'source:Tasks_Model_Task', operator: 'equals', value: this.record.id});
+            filters.push({field: 'source~Tasks_Model_Task', operator: 'equals', value: this.record.id});
         }
     },
 

diff --git a/tine20/Tinebase/js/ApplicationStarter.js b/tine20/Tinebase/js/ApplicationStarter.js
@@ -198,7 +198,7 @@ Ext.apply(Tine.Tinebase.ApplicationStarter,{
                 filter = availableModels.reduce((filter, model) => {
                     const [appName,,modelName] = model.split('_');
                     const filterDefinition = Object.assign({... base}, {
-                        field: `${base.field}:${model}`,
+                        field: `${base.field}~${model}`,
                         preserveFieldName: true,
                         baseLabel: base.label,
                         label: `${base.label} ${modelName}`,