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

Gruppenadministration: - added delete functionality - Benutzer per group are retrieved via javascript and refreshed when group added/delted - moved gruppenadministration files to person folder from organisation - handle error when benutzer was already assigned to a group

Browse Source
This commit is contained in:
KarpAlex
2022-06-10 22:01:48 +02:00
parent 83351e7329
commit 5bc57767d1
5 changed files with 155 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/organisation/gruppenadministration/benutzergruppe.php → application/views/person/gruppenadministration/benutzergruppe.php
+6 -5
View File
@@ -14,10 +14,10 @@
'filterwidget' => true,
'navigationwidget' => true,
'phrases' => array(
'ui' => array('bitteEintragWaehlen')
'ui'
),
'customCSSs' => 'public/css/sbadmin2/tablesort_bootstrap.css',
'customJSs' => array('public/js/bootstrapper.js', 'public/js/tablesort/tablesort.js', 'public/js/organisation/benutzergruppe.js')
'customJSs' => array('public/js/bootstrapper.js', 'public/js/tablesort/tablesort.js', 'public/js/person/benutzergruppe.js')
)
);
?>
@@ -46,6 +46,7 @@
<input type="hidden" name="gruppe_kurzbz" id="gruppe_kurzbz" value="<?php echo $gruppe_kurzbz ?>">
<span class="input-group-btn">
<button type="button" class="btn btn-default" id="teilnehmerHinzufuegen">
<?php echo $this->p->t('gruppenadministration', 'benutzer') ?>&nbsp;
<?php echo $this->p->t('ui', 'hinzufuegen') ?>
</button>
</span>
@@ -63,18 +64,18 @@
<th><?php echo ucfirst($this->p->t('ui', 'loeschen')); ?></th>
</thead>
<tbody>
<?php foreach ($benutzer as $ben): ?>
<!-- <php foreach ($benutzer as $ben): ?>
<tr>
<td><?php echo $ben->uid; ?></td>
<td><?php echo $ben->vorname; ?></td>
<td><?php echo $ben->nachname; ?></td>
<td>
<button class="btn btn-default benutzerLoeschen" id="benutzerLoeschen">
<?php echo ucfirst($this->p->t('ui', 'loeschen')); ?>
<php echo ucfirst($this->p->t('ui', 'loeschen')); >
</button>
</td>
</tr>
<?php endforeach; ?>
<php endforeach; ?> -->
</tbody>
</table>
</div>
application/views/organisation/gruppenadministration/gruppenadministration.php → application/views/person/gruppenadministration/gruppenadministration.php
+1 -1
View File
@@ -36,7 +36,7 @@
</div>
</div>
<div>
<?php $this->load->view('organisation/gruppenadministration/gruppenadministrationData.php'); ?>
<?php $this->load->view('person/gruppenadministration/gruppenadministrationData.php'); ?>
</div>
</div>
</div>
application/views/organisation/gruppenadministration/gruppenadministrationData.php → application/views/person/gruppenadministration/gruppenadministrationData.php
+1 -1
View File
@@ -24,7 +24,7 @@
/* NOTE: Dont use $this here for PHP Version compatibility */
$datasetRaw->{'Teilnehmer'} = sprintf(
'<a href="%s?gruppe_kurzbz=%s&origin_page=%s&fhc_controller_id=%s">'.$this->p->t('gruppenadministration', 'zuweisenlöschen').'</a>',
site_url('organisation/Gruppenadministration/showBenutzergruppe'),
site_url('person/Gruppenadministration/showBenutzergruppe'),
$datasetRaw->{'gruppe_kurzbz'},
'index',
(isset($_GET['fhc_controller_id'])?$_GET['fhc_controller_id']:'')