Merge pull request #14 from paritshivani/Bug#157606

Bug #13 fix: Update backend list view of users table and change client field name to T&C code everywhere
techjoomla · Feb 13, 2020 · c09aed3 · c09aed3
2 parents 7f091e5 + 4dddf54
commit c09aed3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/src/components/com_tc/administrator/models/forms/content.xml b/src/components/com_tc/administrator/models/forms/content.xml
@@ -15,7 +15,7 @@
 
     <field name="version" required="true" class="validate-version" label="COM_TC_FORM_LBL_CONTENT_VERSION" description="COM_TC_FORM_DESC_CONTENT_VERSION" hint="COM_TC_FORM_LBL_CONTENT_VERSION"/>
 
-    <field name="client" required="true" id="client_id" class="validate-client" label="COM_TC_FORM_LBL_CONTENT_CLIENT" description="COM_TC_FORM_DESC_CONTENT_CLIENT" hint="COM_TC_FORM_LBL_CONTENT_CLIENT" />
+    <field name="client" required="true" id="client_id" class="validate-client" label="COM_TC_FORM_LBL_CONTENT_TC_CODE" description="COM_TC_FORM_DESC_CONTENT_CLIENT" hint="COM_TC_FORM_LBL_CONTENT_TC_CODE" />
 
     <field name= "url_pattern"  id="url_pattern_id" description= "COM_TC_FORM_LBL_CONTENT_URL_PATTERN_DESC"  type= "subform"  label= "COM_TC_FORM_LBL_CONTENT_URL_PATTERN"  min= "1"  max= "1000"  formsource= "/administrator/components/com_tc/models/forms/url_pattern.xml"  multiple= "true"  buttons= "add,remove"  layout="joomla.form.field.subform.repeatable-table" groupByFieldset="false" />
     <field name="start_date"

diff --git a/src/components/com_tc/administrator/views/contents/tmpl/default.php b/src/components/com_tc/administrator/views/contents/tmpl/default.php
@@ -57,7 +57,7 @@
 						<?php echo HTMLHelper::_('searchtools.sort',  'COM_TC_CONTENTS_VERSION', 'a.version', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left'>
-						<?php echo HTMLHelper::_('searchtools.sort',  'COM_TC_CONTENTS_CLIENT', 'a.client', $listDirn, $listOrder); ?>
+						<?php echo HTMLHelper::_('searchtools.sort',  'COM_TC_USERTCS_TC_CODE', 'a.client', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left'>
 						<?php echo HTMLHelper::_('searchtools.sort',  'COM_TC_CONTENTS_START_DATE', 'a.start_date', $listDirn, $listOrder); ?>

diff --git a/src/components/com_tc/administrator/views/usertcs/tmpl/default.php b/src/components/com_tc/administrator/views/usertcs/tmpl/default.php
@@ -71,23 +71,17 @@
 					<?php echo JHtml::_('grid.sort',  'COM_TC_USERTCS_NAME', 'uc.`name`', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left'>
-					<?php echo JHtml::_('grid.sort',  'COM_TC_USERTCS_ID', 'a.`tc_id`', $listDirn, $listOrder); ?>
-					</th>
-					<th class='left'>
 					<?php echo JHtml::_('grid.sort',  'COM_TC_USERTCS_TITLE', 'c.`title`', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left'>
-					<?php echo JHtml::_('grid.sort',  'COM_TC_USERTCS_CLIENT', 'c.`client`', $listDirn, $listOrder); ?>
+					<?php echo JHtml::_('grid.sort',  'COM_TC_USERTCS_TC_CODE', 'c.`client`', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left'>
 					<?php echo JHtml::_('grid.sort',  'COM_TC_CONTENTS_VERSION', 'c.`version`', $listDirn, $listOrder); ?>
 					</th>
 					<th class='left'>
 					<?php echo JHtml::_('grid.sort',  'COM_TC_USERTCS_ACCEPTED_DATE', 'a.`accepted_date`', $listDirn, $listOrder); ?>
 					</th>
-					<th class='left'>
-					<?php echo JHtml::_('grid.sort',  'COM_TC_USERTCS_USERID', 'a.`user_id`', $listDirn, $listOrder); ?>
-					</th>
 				</tr>
 				</thead>
 				<tfoot>
@@ -106,8 +100,7 @@
 						</td>
 						<td>
 							<?php echo $this->escape($item->name); ?>
-						<td>
-							<?php echo $item->tc_id; ?>
+						</td>
 						<td>
 							<?php echo $this->escape($item->title); ?>
 						</td>
@@ -120,9 +113,6 @@
 						<td>
 							<?php echo $item->accepted_date; ?>
 						</td>
-						<td>
-							<?php echo $item->user_id; ?>
-						</td>
 					</tr>
 				<?php
 				endforeach; ?>

diff --git a/src/components/com_tc/languages/administrator/en-GB/en-GB.com_tc.ini b/src/components/com_tc/languages/administrator/en-GB/en-GB.com_tc.ini
@@ -62,7 +62,7 @@ COM_TC_FORM_LBL_CONTENT_TITLE="Title"
 COM_TC_FORM_DESC_CONTENT_TITLE=""
 COM_TC_FORM_LBL_CONTENT_VERSION="Version"
 COM_TC_FORM_DESC_CONTENT_VERSION=""
-COM_TC_FORM_LBL_CONTENT_CLIENT="Client"
+COM_TC_FORM_LBL_CONTENT_TC_CODE="T&C code"
 COM_TC_FORM_DESC_CONTENT_CLIENT="Apply to specific extensions "
 COM_TC_FORM_LBL_CONTENT_START_DATE="Start Date"
 COM_TC_FORM_DESC_CONTENT_START_DATE=""
@@ -74,7 +74,7 @@ COM_TC_USERTCS_ID="T&C Id"
 COM_TC_USERTCS_USERID="User Id"
 COM_TC_USERTCS_NAME="User Name"
 COM_TC_USERTCS_TITLE="T&C Title"
-COM_TC_USERTCS_CLIENT="Client"
+COM_TC_USERTCS_TC_CODE="T&C code"
 COM_TC_USERTCS_ACCEPTED_DATE="T&C Accepted date"
 COM_TC_TITLE_USERTCS="Users"