Updated publisher list columns

Replaced active identifiers with other names. #9
petkivim · Aug 13, 2016 · 0fe265c · 0fe265c
1 parent 114be4c
commit 0fe265c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/src/monograph-publishers/com_isbnregistry/admin/language/fi-FI/fi-FI.com_isbnregistry.ini b/src/monograph-publishers/com_isbnregistry/admin/language/fi-FI/fi-FI.com_isbnregistry.ini
@@ -7,7 +7,7 @@ COM_ISBNREGISTRY_CONFIRM_DELETE="Oletko varma, että haluat poistaa valitut tied
 
 COM_ISBNREGISTRY_PUBLISHERS_NUM="#"
 COM_ISBNREGISTRY_PUBLISHERS_OFFICIAL_NAME="Nimi"
-COM_ISBNREGISTRY_PUBLISHERS_ACTIVE_IDENTIFIERS="Aktiiviset kustantajatunnukset"
+COM_ISBNREGISTRY_PUBLISHERS_OTHER_NAMES="Muut nimet"
 COM_ISBNREGISTRY_PUBLISHERS_ID="Id"
 COM_ISBNREGISTRY_EDIT_PUBLISHER="Muokkaa"
 COM_ISBNREGISTRY_PUBLISHERS_HEADING_ID="Id"

diff --git a/src/monograph-publishers/com_isbnregistry/admin/models/publishers.php b/src/monograph-publishers/com_isbnregistry/admin/models/publishers.php
@@ -99,7 +99,7 @@ protected function getListQuery() {
         $targetField = $this->getState('filter.target_field');
 
         // Create the base select statement.
-        $query->select('DISTINCT a.id, a.official_name, a.active_identifier_isbn, a.active_identifier_ismn, a.created')
+        $query->select('DISTINCT a.id, a.official_name, a.other_names, a.active_identifier_isbn, a.active_identifier_ismn, a.created')
                 ->from($db->quoteName('#__isbn_registry_publisher') . ' AS a');
 
         // Set has quitted

diff --git a/src/monograph-publishers/com_isbnregistry/admin/views/publishers/tmpl/default.php b/src/monograph-publishers/com_isbnregistry/admin/views/publishers/tmpl/default.php
@@ -53,11 +53,11 @@
                         <th width="2%">
                             <?php echo JHtml::_('grid.checkall'); ?>
                         </th>
-                        <th width="65%">
+                        <th width="45%">
                             <?php echo JText::_('COM_ISBNREGISTRY_PUBLISHERS_OFFICIAL_NAME'); ?>
                         </th>
-                        <th width="25%">
-                            <?php echo JText::_('COM_ISBNREGISTRY_PUBLISHERS_ACTIVE_IDENTIFIERS'); ?>
+                        <th width="50%">
+                            <?php echo JText::_('COM_ISBNREGISTRY_PUBLISHERS_OTHER_NAMES'); ?>
                         </th>
                         <th width="2%">
                             <?php echo JText::_('COM_ISBNREGISTRY_PUBLISHERS_ID'); ?>
@@ -90,12 +90,7 @@
                                 </span>
                             </td>   
                             <td>
-                                <?php
-                                $identifier = empty($row->active_identifier_isbn) ? '' : $row->active_identifier_isbn;
-                                $identifier .=!empty($row->active_identifier_isbn) && !empty($row->active_identifier_ismn) ? ', ' : '';
-                                $identifier .= empty($row->active_identifier_ismn) ? '' : $row->active_identifier_ismn;
-                                echo $identifier;
-                                ?>
+                                <?php echo $row->other_names; ?>
                             </td> 
                             <td align="center">
                                 <?php echo $row->id; ?>