Skip to content

Commit

Permalink
V3.43.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@veenmeyer
veenmeyer committed Mar 24, 2020
1 parent 99d7dbe commit 2e5a21b
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 15 deletions.
2 changes: 2 additions & 0 deletions administrator/CHANGELOG.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

<h3>Changelog <small>Version 3.43</small></h3>
<ul>
# diverse kleinere Bugfixes
# Fehler beim Sperren und Veröffentlichen in der Einsatzübersicht behoben
+ Anzeige der Einsatznummer in der Detailansicht
# Fehler in Kartenzentrierung (OSM) behoben (in der View Gmap-Konfig.)
# Einsatzorte nur für registr. User anzeigen -> Einsatzübersichts-Karte
Expand Down
16 changes: 15 additions & 1 deletion administrator/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,21 @@
<option
value="1">JYES</option>
</field>


<field
name="display_rss_alerttime"
type="radio"
showon ="display_home_rss:1"
class="btn-group"
default="0"
label="Anzeige Alarmierungszeit"
description="">
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>

<field
name="display_rss_time"
type="radio"
Expand Down
11 changes: 7 additions & 4 deletions administrator/einsatzkomponente.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.2.0" method="upgrade">
<name>com_einsatzkomponente</name>
<creationDate>2020-03-16</creationDate>
<copyright>Copyright (C) 2019 by Ralf Meyer. All rights reserved.</copyright>
<creationDate>2020-03-24</creationDate>
<copyright>Copyright (C) 2020 by Ralf Meyer. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later</license>
<author>Ralf Meyer</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://einsatzkomponente.de</authorUrl>
<version>3.42.2_beta</version>
<version>3.43.0</version>

<description>
<![CDATA[
<h1>Einsatzkomponente</h1><h3>für das Joomla-CMS</h3>
<div style="clear: both;"></div>
<p>Copyright (C) 2018 Ralf Meyer</p>
<p>Copyright (C) 2020 Ralf Meyer</p>
<p>Website: <a href='https://www.einsatzkomponente.de'>www.einsatzkomponente.de</a></p>
<p><a target="_blank" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9HDFKVJSKSEFY"><span style="float:right;">Dieses Projekt jetzt unterstützen: <img border=0 src="https://www.paypalobjects.com/de_DE/DE/i/btn/btn_donateCC_LG.gif" /></span></a>
<p><small><span style="float:left;"></br>Alternativ können Sie die Kontodaten per <a href="mailto:[email protected]?Subject=Spende%20Einsatzkomponente%20J3.x" target="_top">Email </a>anfordern.</span></small></p>
</p>
]]>
</description>

Expand Down
11 changes: 7 additions & 4 deletions einsatzkomponente.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.2.0" method="upgrade">
<name>com_einsatzkomponente</name>
<creationDate>2020-03-16</creationDate>
<copyright>Copyright (C) 2019 by Ralf Meyer. All rights reserved.</copyright>
<creationDate>2020-03-24</creationDate>
<copyright>Copyright (C) 2020 by Ralf Meyer. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later</license>
<author>Ralf Meyer</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://einsatzkomponente.de</authorUrl>
<version>3.42.2_beta</version>
<version>3.43.0</version>

<description>
<![CDATA[
<h1>Einsatzkomponente</h1><h3>für das Joomla-CMS</h3>
<div style="clear: both;"></div>
<p>Copyright (C) 2018 Ralf Meyer</p>
<p>Copyright (C) 2020 Ralf Meyer</p>
<p>Website: <a href='https://www.einsatzkomponente.de'>www.einsatzkomponente.de</a></p>
<p><a target="_blank" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9HDFKVJSKSEFY"><span style="float:right;">Dieses Projekt jetzt unterstützen: <img border=0 src="https://www.paypalobjects.com/de_DE/DE/i/btn/btn_donateCC_LG.gif" /></span></a>
<p><small><span style="float:left;"></br>Alternativ können Sie die Kontodaten per <a href="mailto:[email protected]?Subject=Spende%20Einsatzkomponente%20J3.x" target="_top">Email </a>anfordern.</span></small></p>
</p>
]]>
</description>

Expand Down
27 changes: 22 additions & 5 deletions site/controllers/einsatzberichtform.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,29 @@ function publish() {
return false;
}



if ($data['id']):
$db = JFactory::getDBO();
$query = $db->getQuery(true);
$query->update('#__eiko_einsatzberichte');
$query->set('state = "'.$data['state'].'" ');
$query->where('id ="'.$data['id'].'"');
$db->setQuery((string) $query);
try
{
$db->execute();
$return = true;
}
catch (RuntimeException $e)
{
throw new Exception($e->getMessage(), 500);
}
endif;


// Attempt to save the data.
$return = $model->save($data);
//$return = $model->save($data);

// Check for errors.
if ($return === false) {
Expand All @@ -192,10 +213,6 @@ function publish() {
}


// Check in the profile.
if ($return) {
$model->checkin($return);
}

// Clear the profile id from the session.
//$app->setUserState('com_einsatzkomponente.edit.einsatzbericht.id', null);
Expand Down
2 changes: 1 addition & 1 deletion site/views/einsatzarchiv/tmpl/main_layout_bottom.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<?php if (!$this->params->get('eiko')) : ?>
<tr><!-- Bitte das Copyright nicht entfernen. Danke. -->
<td colspan="<?php echo $eiko_col; ?>">
<span class="copyright">Einsatzkomponente V<?php echo $this->version; ?> (C) 2017 by Ralf Meyer ( <a class="copyright_link" href="https://einsatzkomponente.de" target="_blank">www.einsatzkomponente.de</a> )</span>
<span class="copyright">Einsatzkomponente V<?php echo $this->version; ?> (C) 2020 by Ralf Meyer ( <a class="copyright_link" href="https://einsatzkomponente.de" target="_blank">www.einsatzkomponente.de</a> )</span>
</td>
</tr>
<?php endif; ?>
Expand Down
4 changes: 4 additions & 0 deletions site/views/einsatzarchiv/view.feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ public function display($tpl = null) {

$rss_item->description .= '<table>';

if ($item->date1 >1 and $this->params->get('display_rss_alerttime','0')) :
$rss_item->description .= '<tr><td><b>Alarmierung am</b>: '.date('d.m.Y', $item->date1).' um '.date('H:i', $item->date1).' Uhr</td></tr>';
endif;


if ($desc) :
$rss_item->description .= '<tr><td>'.$desc.'</td></tr>';
Expand Down

0 comments on commit 2e5a21b

Please sign in to comment.