blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 08:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into demo

Browse Source 
# Conflicts:
#	public/js/components/Tag/Tag.js
This commit is contained in:
ma0048
2025-09-03 10:51:56 +02:00
parent 3bdac887bf 396251b061
commit 027be3e30e
7 changed files with 193 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/lv/Gruppe.php
+1 -1
View File
@@ -116,7 +116,7 @@ class Gruppe extends FHCAPI_Controller
bezeichnung,
gid,
\'false\' as lehrverband');
$gruppen_result = $this->_ci->GruppeModel->loadWhere(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false));
$gruppen_result = $this->_ci->GruppeModel->loadWhere(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
$gruppen_array = array();
application/controllers/api/frontend/v1/lv/Tags.php
+26
View File
@@ -20,5 +20,31 @@ class Tags extends Tag_Controller
'doneLehre' => self::BERECHTIGUNG_KURZBZ,
'deleteLehre' => self::BERECHTIGUNG_KURZBZ,
]);
$this->config->load('lvverwaltung');
}
public function getTag($readonly_tags = null)
{
parent::getTag($this->config->item('lvverwaltung_tags'));
}
public function getTags($tags = null)
{
parent::getTags($this->config->item('lvverwaltung_tags'));
}
public function addTag($withZuordnung = true, $updatable_tags = null)
{
parent::addTag(true, $this->config->item('lvverwaltung_tags'));
}
public function updateTag($updatable_tags = null)
{
parent::updateTag($this->config->item('lvverwaltung_tags'));
}
public function deleteTag($withZuordnung = true, $updatable_tags = null)
{
parent::deleteTag(true, $this->config->item('lvverwaltung_tags'));
}
public function doneTag($updatable_tags = null)
{
parent::doneTag($this->config->item('lvverwaltung_tags'));
}
}