Bug techjoomla#231 fix: backend>> The title of form view of field gro…

…up is not appropriate
apghalsasi25 · Dec 10, 2019 · 627e10c · 627e10c
1 parent c1e0e72
commit 627e10c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/admin_language/en-GB/en-GB.com_tjfields.ini b/admin_language/en-GB/en-GB.com_tjfields.ini
@@ -340,6 +340,7 @@ COM_TJFIELDS_FORM_DESC_CITY_CITY_JTEXT_HELP="*You will need to add this constant
 COM_TJFIELDS_FILTER_SELECT_REGION="- Select Region"
 COM_TJFIELDS_CITY_EXISTS_IN_REGION_COUNTRY="Another city with same name exists in selcted country and region."
 
+<<<<<<< HEAD
 COM_TJLMS_COMPONENT="LMS"
 COM_JTICKETING_COMPONENT="Ticketing"
 COM_TJUCM_COMPONENT="UCM"
@@ -353,6 +354,14 @@ COM_TJFIELDS_PAGE_EDIT_GROUP ="Types - Edit Field Group"
 COM_TJFIELDS_PAGE_ADD_FIELD  ="Types - New Field"
 COM_TJFIELDS_PAGE_EDIT_FIELD ="Types - Edit Field"
 
+=======
+COM_TJFIELDS_TITLE_COMPONENT="Fields"
+COM_TJFIELDS_TITLE_COMPONENT_GROUPS="Field Groups"
+COM_TJFIELDS_ADD_GROUP="Field Group: Add"
+COM_TJFIELDS_EDIT_GROUP="Field Group: Edit"
+COM_TJFIELDS_ADD_FIELD="Field: Add"
+COM_TJFIELDS_EDIT_FIELD="Field: Edit"
+>>>>>>> origin/Bug#154244
 COM_TJFIELDS_GROUP_TITLE_ALREADY_EXISTS="Field group with same name already exists"
 
 ;validation

diff --git a/administrator/views/group/view.html.php b/administrator/views/group/view.html.php
@@ -76,6 +76,7 @@ protected function addToolbar()
 		}
 
 		$component_title = '';
+		//$component_title = JText::_('COM_TJFIELDS_TITLE_COMPONENT');
 
 		if (!empty($client))
 		{
@@ -101,6 +102,7 @@ protected function addToolbar()
 		);
 
 
+
 		$canDo = TjfieldsHelper::getActions($client['0'], 'group');
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,7 @@ protected function addToolbar() @@
     		}
     		$component_title = '';
+    		//$component_title = JText::_('COM_TJFIELDS_TITLE_COMPONENT');
     		if (!empty($client))
     		{
@@ Expand All / @@ -101,6 +102,7 @@ protected function addToolbar() @@
     		);
     		$canDo = TjfieldsHelper::getActions($client['0'], 'group');
@@ Expand Down @@