add display_name and extras columns to tables

srsolutionsag · Oct 11, 2023 · f00b724 · f00b724
1 parent 2684abd
commit f00b724
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 4 deletions.
diff --git a/classes/Conf/PublicationUsage/class.xoctPublicationSubUsageTableGUI.php b/classes/Conf/PublicationUsage/class.xoctPublicationSubUsageTableGUI.php
@@ -66,6 +66,7 @@ public function fillRow($a_set)
         $PublicationSubUsage = PublicationSubUsage::find($a_set['id']);
         $this->tpl->setVariable('PARENT_USAGE_ID', $PublicationSubUsage->getParentUsageId());
         $this->tpl->setVariable('TITLE', $PublicationSubUsage->getTitle());
+        $this->tpl->setVariable('DISPLAY_NAME', $PublicationSubUsage->getDisplayName());
         $this->tpl->setVariable('DESCRIPTION', $PublicationSubUsage->getDescription());
         $this->tpl->setVariable('CHANNEL', $PublicationSubUsage->getChannel());
         $this->tpl->setVariable('MD_TYPE', $this->parent_obj->txt('md_type_' . $PublicationSubUsage->getMdType()));
@@ -86,6 +87,15 @@ public function fillRow($a_set)
         }
         $this->tpl->setVariable('GROUP_NAME', $group_name);
 
+        $extras = [];
+        if ($PublicationSubUsage->getParentUsageId() == PublicationUsage::USAGE_DOWNLOAD ||
+            $PublicationSubUsage->getParentUsageId() == PublicationUsage::USAGE_DOWNLOAD_FALLBACK) {
+            if ($PublicationSubUsage->isExternalDownloadSource()) {
+                $extras[] = $this->parent_obj->txt('ext_dl_source');
+            }
+        }
+        $this->tpl->setVariable('EXTRA_CONFIG', implode('<br>', $extras));
+
         $this->addActionMenu($PublicationSubUsage);
     }
 
@@ -94,12 +104,14 @@ protected function initColumns()
     {
         $this->addColumn($this->parent_obj->txt('parent_usage_id'));
         $this->addColumn($this->parent_obj->txt('title'));
+        $this->addColumn($this->parent_obj->txt('display_name'));
         $this->addColumn($this->parent_obj->txt('description'));
         $this->addColumn($this->parent_obj->txt('channel'));
         $this->addColumn($this->parent_obj->txt('md_type'));
         $this->addColumn($this->parent_obj->txt('flavor'));
         $this->addColumn($this->parent_obj->txt('tag'));
         $this->addColumn($this->parent_obj->txt('group_th'));
+        $this->addColumn($this->parent_obj->txt('extra_config'));
 
         $this->addColumn($this->plugin->txt('common_actions'), '', '150px');
     }

diff --git a/classes/Conf/PublicationUsage/class.xoctPublicationUsageTableGUI.php b/classes/Conf/PublicationUsage/class.xoctPublicationUsageTableGUI.php
@@ -73,6 +73,7 @@ protected function fillRow($a_set)
         $PublicationUsage = $this->repository->getUsage($a_set['usage_id']);
         $this->tpl->setVariable('USAGE_ID', $PublicationUsage->getUsageId());
         $this->tpl->setVariable('TITLE', $PublicationUsage->getTitle());
+        $this->tpl->setVariable('DISPLAY_NAME', $PublicationUsage->getDisplayName());
         $this->tpl->setVariable('DESCRIPTION', $PublicationUsage->getDescription());
         $this->tpl->setVariable('CHANNEL', $PublicationUsage->getChannel());
         $this->tpl->setVariable('MD_TYPE', $this->parent_obj->txt('md_type_' . $PublicationUsage->getMdType()));
@@ -93,20 +94,30 @@ protected function fillRow($a_set)
         }
         $this->tpl->setVariable('GROUP_NAME', $group_name);
 
+        $extras = [];
+        if ($PublicationUsage->getUsageId() == PublicationUsage::USAGE_DOWNLOAD ||
+            $PublicationUsage->getUsageId() == PublicationUsage::USAGE_DOWNLOAD_FALLBACK) {
+            if ($PublicationUsage->isExternalDownloadSource()) {
+                $extras[] = $this->parent_obj->txt('ext_dl_source');
+            }
+        }
+        $this->tpl->setVariable('EXTRA_CONFIG', implode('<br>', $extras));
+
         $this->addActionMenu($PublicationUsage);
     }
 
     protected function initColumns()
     {
         $this->addColumn($this->parent_obj->txt('usage_id'));
         $this->addColumn($this->parent_obj->txt('title'));
+        $this->addColumn($this->parent_obj->txt('display_name'));
         $this->addColumn($this->parent_obj->txt('description'));
         $this->addColumn($this->parent_obj->txt('channel'));
         $this->addColumn($this->parent_obj->txt('md_type'));
         $this->addColumn($this->parent_obj->txt('flavor'));
         $this->addColumn($this->parent_obj->txt('tag'));
         $this->addColumn($this->parent_obj->txt('group_th'));
-        //		$this->addColumn($this->txt('status'));
+        $this->addColumn($this->parent_obj->txt('extra_config'));
 
         $this->addColumn($this->plugin->txt('common_actions'), '', '150px');
     }

diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
@@ -614,4 +614,6 @@ publication_usage_table_title_usage_group#:#Publikation Gruppe
 publication_usage_create_group#:#Gruppe erstellen
 publication_usage_edit_group#:#Gruppe bearbeiten
 publication_usage_confirm_delete_text_group#:#Sind Sie sicher, dass Sie diese Publikationsgruppe löschen möchten?
+publication_usage_extra_config#:#Zusätzliche
 pug_display_name_default#:#Mehr
+
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
@@ -615,3 +615,4 @@ publication_usage_table_title_usage_group#:#Publication Groups
 publication_usage_create_group#:#Create Group
 publication_usage_edit_group#:#Edit Group
 publication_usage_confirm_delete_text_group#:#Are you sure you want to delete this publication group?
+publication_usage_extra_config#:#Extras
diff --git a/templates/default/tpl.publication_sub_usage.html b/templates/default/tpl.publication_sub_usage.html
@@ -5,6 +5,9 @@
 	<td class="std small">
 		{TITLE}
 	</td>
+	<td class="std small">
+		{DISPLAY_NAME}
+	</td>
 	<td class="std small">
 		{DESCRIPTION}
 	</td>
@@ -23,6 +26,9 @@
 	<td class="std small">
 		{GROUP_NAME}
 	</td>
+	<td class="std small">
+		{EXTRA_CONFIG}
+	</td>
 	<td class="std small">
 		{ACTIONS}
 	</td>

diff --git a/templates/default/tpl.publication_usage.html b/templates/default/tpl.publication_usage.html
@@ -5,6 +5,9 @@
 	<td class="std small">
 		{TITLE}
 	</td>
+	<td class="std small">
+		{DISPLAY_NAME}
+	</td>
 	<td class="std small">
 		{DESCRIPTION}
 	</td>
@@ -20,12 +23,12 @@
 	<td class="std small">
 		{TAG}
 	</td>
-	<!--<td class="std small">-->
-		<!--{STATUS}-->
-	<!--</td>-->
 	<td class="std small">
 		{GROUP_NAME}
 	</td>
+	<td class="std small">
+		{EXTRA_CONFIG}
+	</td>
 	<td class="std small">
 		{ACTIONS}
 	</td>