diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 48df269b2..4a30c137b 100755
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -14,7 +14,7 @@
SELECT zeitpunkt
FROM system.tbl_log
WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\')
- AND logdata->>\'name\' != \'Login with code\'
+ AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\')
AND person_id = p.person_id
ORDER BY zeitpunkt DESC
LIMIT 1
@@ -23,7 +23,7 @@
SELECT insertvon
FROM system.tbl_log
WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\')
- AND logdata->>\'name\' != \'Login with code\'
+ AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\')
AND person_id = p.person_id
ORDER BY zeitpunkt DESC
LIMIT 1
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
index f79a1e449..eb14f41ae 100644
--- a/application/views/widgets/filter/selectFilters.php
+++ b/application/views/widgets/filter/selectFilters.php
@@ -29,28 +29,6 @@
});
- $(".remove-filter").click(function(event) {
-
- $.ajax({
- url: "",
- method: "POST",
- data: {
- fieldName: $(this).attr('filterToRemove')
- }
- })
- .done(function(data, textStatus, jqXHR) {
-
- resetSelectedFilters();
- renderSelectedFilters();
-
- renderTableDataset();
-
- }).fail(function(jqXHR, textStatus, errorThrown) {
- alert(textStatus);
- });
-
- });
-
$(".select-filter-operation").change(function() {
if ($(this).val() == "set" || $(this).val() == "nset")
diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php
index 1fdb4b6b3..427fecf2e 100644
--- a/application/views/widgets/navigationMenu.php
+++ b/application/views/widgets/navigationMenu.php
@@ -139,7 +139,7 @@
{
// Hiding/showing navigation menu - works only with sb admin 2 template!!
- $("#side-menu").prepend('
');
+ $("#side-menu").html('');
$("#collapseicon").click(function() {
$("#page-wrapper").css('margin-left', '0px');
$("#side-menu").hide();
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
old mode 100644
new mode 100755
index cd41a1abb..3f56f7f55
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -860,6 +860,7 @@ if ($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berech
// End extensions
//---------------------------------------------------------------------------------------------------------------------
+// Tabellen fuer Person Log
if (!$result = @$db->db_query("SELECT 1 FROM system.tbl_log LIMIT 1"))
{
$qry = "CREATE TABLE system.tbl_log
@@ -910,6 +911,20 @@ if (!$result = @$db->db_query("SELECT 1 FROM system.tbl_log LIMIT 1"))
echo ' system.tbl_log hinzugefügt
';
}
+// Add index to system.tbl_log
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_log_person_id'"))
+{
+ if ($db->db_num_rows($result) == 0)
+ {
+ $qry = "CREATE INDEX idx_tbl_log_person_id ON system.tbl_log USING btree (person_id)";
+
+ if (! $db->db_query($qry))
+ echo 'Indizes: ' . $db->db_last_error() . '
';
+ else
+ echo 'Index fuer system.tbl_log hinzugefuegt';
+ }
+}
+
//---------------------------------------------------------------------------------------------------------------------
// Start filters
@@ -1822,7 +1837,7 @@ if(!@$db->db_query("SELECT oe_kurzbz FROM campus.tbl_dms_kategorie LIMIT 1"))
{
$qry = "ALTER TABLE campus.tbl_dms_kategorie ADD COLUMN oe_kurzbz varchar(32);
ALTER TABLE campus.tbl_dms_kategorie ADD COLUMN berechtigung_kurzbz varchar(32);
-
+
ALTER TABLE campus.tbl_dms_kategorie ADD CONSTRAINT fk_dms_kategorie_oe_kurzbz FOREIGN KEY (oe_kurzbz) REFERENCES public.tbl_organisationseinheit(oe_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;
ALTER TABLE campus.tbl_dms_kategorie ADD CONSTRAINT fk_dms_kategorie_berechtigung_kurzbz FOREIGN KEY (berechtigung_kurzbz) REFERENCES system.tbl_berechtigung(berechtigung_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;
";