Merge remote-tracking branch 'origin/master' into develop

# Conflicts: # datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php # dictionaries/zh_cn.dictionary.itop.core.php # dictionaries/zh_cn.dictionary.itop.ui.php
2026-05-21 08:12:26 +02:00 · 2019-03-04 09:21:14 +01:00
parent 06592d7d37 24aca83de4
commit 065895aa73
178 changed files with 2457 additions and 1400 deletions
--- a/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php
@@ -139,7 +139,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(

 // Filter brick
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-    'Brick:Portal:Filter:Name' => 'Prefilter a brick~~', // @todo review where this is used
+    'Brick:Portal:Filter:Name' => 'Prefilter a brick~~',
    'Brick:Portal:Filter:SearchInput:Placeholder' => 'bv. wifi-verbinding',
    'Brick:Portal:Filter:SearchInput:Submit' => 'Zoek',
 ));
--- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_list.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_list.html.twig
@@ -242,33 +242,32 @@
 					}
 				},
 				{% if sDataLoading == constant('Combodo\\iTop\\Portal\\Brick\\AbstractBrick::ENUM_DATA_LOADING_FULL') %}
-					"data": oRawDatas,
+				"data": oRawDatas,
 				{% else %}
-					"processing": true,
-					"serverSide": true,
-					"ajax": {
-						"url": "{{ app.url_generator.generate('p_browse_brick_mode', {'sBrickId': sBrickId, 'sBrowseMode': constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_BROWSE_MODE_LIST')})|raw }}",
-						"data": function(d){
-							d.iPageNumber = Math.floor(d.start/d.length) + 1;
-							d.iListLength = d.length;
-							d.sDataLoading = "{{ constant('Combodo\\iTop\\Portal\\Brick\\AbstractBrick::ENUM_DATA_LOADING_LAZY') }}";
-							d.columns = null;
-							d.orders = null;
-							{% if sSearchValue is not null %}
-								// Sets default filter value
-								if(d.draw === 1)
-								{
-									$('#brick-content-table_filter input').val('{{ sSearchValue }}');
-									d.search.value = $('#brick-content-table_filter input').val();
-								}
-							{% endif %}
-							if(d.search.value)
-							{
-								d.sSearchValue = d.search.value;
-							}
+				"processing": true,
+				"serverSide": true,
+				"ajax": {
+					"url": "{{ app.url_generator.generate('p_browse_brick_mode', {'sBrickId': sBrickId, 'sBrowseMode': constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_BROWSE_MODE_LIST')})|raw }}",
+					"data": function (d) {
+						d.iPageNumber = Math.floor(d.start / d.length)+1;
+						d.iListLength = d.length;
+						d.sDataLoading = "{{ constant('Combodo\\iTop\\Portal\\Brick\\AbstractBrick::ENUM_DATA_LOADING_LAZY') }}";
+						d.columns = null;
+						d.orders = null;
+
+						if (d.search.value)
+						{
+							d.sSearchValue = d.search.value;
 						}
 					}
+				},
 				{% endif %}
+				"search": {
+					"caseInsensitive": true,
+					{% if sSearchValue is not null %}
+					"search": "{{ sSearchValue|escape('js') }}",
+					{% endif %}
+				},
 			});
 			// Overrides filter input to apply throttle. Otherwise, an ajax request is send each time a key is pressed
 			// Also removes accents from search string
--- a/datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
@@ -20,7 +20,6 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-
 // Portal
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Page:DefaultTitle' => 'iTop 用户门户',
@@ -28,9 +27,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Page:Home' => '主页',
 	'Page:GoPortalHome' => '主页面',
 	'Page:GoPreviousPage' => '上一页',
-	'Page:ReloadPage' => '重新加载',
+    'Page:ReloadPage' => '重新加载',
 	'Portal:Button:Submit' => '提交',
-	'Portal:Button:Apply' => '更新',
+    'Portal:Button:Apply' => '更新',
 	'Portal:Button:Cancel' => '取消',
 	'Portal:Button:Close' => '关闭',
 	'Portal:Button:Add' => '添加',
@@ -38,13 +37,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Portal:Button:Delete' => '删除',
 	'Portal:EnvironmentBanner:Title' => '您目前处于 <strong>%1$s</strong> 模式',
 	'Portal:EnvironmentBanner:GoToProduction' => '回到产品模式',
-	'Error:HTTP:401' => '认证',
-	'Error:HTTP:404' => '页面找不到',
+    'Error:HTTP:401' => '认证',
+    'Error:HTTP:404' => '页面找不到',
 	'Error:HTTP:500' => 'Oops! 发生了一个错误.',
 	'Error:HTTP:GetHelp' => '如果问题仍然存在,请联系管理员.',
 	'Error:XHR:Fail' => '无法加载数据, 请联系管理员',
-	'Portal:ErrorUserLoggedOut' => '您已退出,请重新登录.',
-	'Portal:Datatables:Language:Processing' => '请稍后...',
+    'Portal:ErrorUserLoggedOut' => '您已退出，请重新登录.',
+    'Portal:Datatables:Language:Processing' => '请稍后...',
 	'Portal:Datatables:Language:Search' => '过滤器:',
 	'Portal:Datatables:Language:LengthMenu' => '每页显示 _MENU_ 项',
 	'Portal:Datatables:Language:ZeroRecords' => '没有结果',
@@ -91,7 +90,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Brick:Portal:Browse:Name' => '浏览项目',
 	'Brick:Portal:Browse:Mode:List' => '列表',
 	'Brick:Portal:Browse:Mode:Tree' => '树形',
-	'Brick:Portal:Browse:Mode:Mosaic' => '嵌套',
+    'Brick:Portal:Browse:Mode:Mosaic' => '嵌套',
 	'Brick:Portal:Browse:Action:Drilldown' => '明细',
 	'Brick:Portal:Browse:Action:View' => '详情',
 	'Brick:Portal:Browse:Action:Edit' => '编辑',
@@ -106,8 +105,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Brick:Portal:Manage:Name' => '管理项目',
 	'Brick:Portal:Manage:Table:NoData' => '没有项目.',
-	'Brick:Portal:Manage:Table:ItemActions' => 'Actions',
-	'Brick:Portal:Manage:DisplayMode:list' => '列表',
+    'Brick:Portal:Manage:Table:ItemActions' => 'Actions',
+    'Brick:Portal:Manage:DisplayMode:list' => '列表',
 	'Brick:Portal:Manage:DisplayMode:pie-chart' => '饼图',
 	'Brick:Portal:Manage:DisplayMode:bar-chart' => '条形图',
 	'Brick:Portal:Manage:Others' => 'Others',
@@ -135,12 +134,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 // CreateBrick brick
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Brick:Portal:Create:Name' => '快速创建',
-	'Brick:Portal:Create:ChooseType' => 'Please, choose a type',
+    'Brick:Portal:Create:ChooseType' => 'Please, choose a type',
 ));

 // Filter brick
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Brick:Portal:Filter:Name' => 'Prefilter a brick',
-	'Brick:Portal:Filter:SearchInput:Placeholder' => '例如. 连接 wifi',
-	'Brick:Portal:Filter:SearchInput:Submit' => '搜素',
+    'Brick:Portal:Filter:Name' => 'Prefilter a brick',
+    'Brick:Portal:Filter:SearchInput:Placeholder' => '例如. 连接 wifi',
+    'Brick:Portal:Filter:SearchInput:Submit' => '搜素',
 ));