From 34cd44e35e72cd601e0378ae4bf999cabdc0a4f1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 21 Nov 2014 11:35:49 +0100 Subject: [PATCH 1/6] more fixes for search by attributes --- SeedDMS_Core/Core/inc.ClassDMS.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 83d1ee923..65b1398f0 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -642,7 +642,7 @@ class SeedDMS_Core_DMS { if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder || $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_all) { if($valueset = $attrdef->getValueSet()) { if($attrdef->getMultipleValues()) { - $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblFolderAttributes` WHERE `tblFolderAttributes`.`attrdef`=".$attrdefid." AND (`tblFolderAttributes`.`value` like '".$valueset[0].implode("%' OR `tblFolderAttributes`.`value` like '".$valueset[0], $attribute)."%' AND `tblFolderAttributes`.`folder`=`tblFolders`.`id`)"; + $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblFolderAttributes` WHERE `tblFolderAttributes`.`attrdef`=".$attrdefid." AND (`tblFolderAttributes`.`value` like '%".$valueset[0].implode("%' OR `tblFolderAttributes`.`value` like '%".$valueset[0], $attribute)."%') AND `tblFolderAttributes`.`folder`=`tblFolders`.`id`)"; } else $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblFolderAttributes` WHERE `tblFolderAttributes`.`attrdef`=".$attrdefid." AND `tblFolderAttributes`.`value`='".$attribute."' AND `tblFolderAttributes`.`folder`=`tblFolders`.`id`)"; } else @@ -805,16 +805,20 @@ class SeedDMS_Core_DMS { if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document || $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_all) { if($valueset = $attrdef->getValueSet()) { if($attrdef->getMultipleValues()) { - $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND (`tblDocumentAttributes`.`value` like '".$valueset[0].implode("%' OR `tblDocumentAttributes`.`value` like '".$valueset[0], $attribute)."%') AND `tblDocumentAttributes`.document = `tblDocuments`.id)"; + $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND (`tblDocumentAttributes`.`value` like '%".$valueset[0].implode("%' OR `tblDocumentAttributes`.`value` like '%".$valueset[0], $attribute)."%') AND `tblDocumentAttributes`.`document` = `tblDocuments`.`id`)"; } else - $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value`='".$attribute."' AND `tblDocumentAttributes`.document = `tblDocuments`.id)"; + $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value`='".$attribute."' AND `tblDocumentAttributes`.`document` = `tblDocuments`.`id`)"; } else - $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value` like '%".$attribute."%') AND `tblDocumentAttributes`.document = `tblDocuments`.id"; + $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value` like '%".$attribute."%') AND `tblDocumentAttributes`.`document` = `tblDocuments`.`id`"; } elseif($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) { - if($attrdef->getValueSet()) - $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentContentAttributes`.`value`='".$attribute."' AND `tblDocumentContentAttributes`.content = `tblDocumentContent`.id"; - else - $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentContentAttributes`.`value` like '%".$attribute."%' AND `tblDocumentContentAttributes`.content = `tblDocumentContent`.id"; + if($attrdef->getValueSet()) { + if($attrdef->getMultipleValues()) { + $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentContentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND (`tblDocumentContentAttributes`.`value` like '%".$valueset[0].implode("%' OR `tblDocumentContentAttributes`.`value` like '%".$valueset[0], $attribute)."%') AND `tblDocumentContentAttributes`.`document` = `tblDocumentContent`.`id`)"; + } else { + $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentContentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentContentAttributes`.`value`='".$attribute."' AND `tblDocumentContentAttributes`.content = `tblDocumentContent`.id"; + } + } else + $searchAttributes[] = "EXISTS (SELECT NULL FROM `tblDocumentContentAttributes` WHERE `tblDocumentContentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentContentAttributes`.`value` like '%".$attribute."%' AND `tblDocumentContentAttributes`.content = `tblDocumentContent`.id"; } } } From 5c60726508be77273cc56e6ba0d1669d117b727e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 21 Nov 2014 11:56:51 +0100 Subject: [PATCH 2/6] new version 4.3.13 --- CHANGELOG | 6 ++++++ Makefile | 2 +- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- SeedDMS_Core/package.xml | 27 ++++++++++++++++++++++----- install/install.php | 2 +- 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 97b16e087..494eec5ad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +-------------------------------------------------------------------------------- + Changes in version 4.3.12 +-------------------------------------------------------------------------------- +- more error fixes when searching for attributes +- fix saving multi value attributes without a maximum number of values + -------------------------------------------------------------------------------- Changes in version 4.3.12 -------------------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 9cc7a681c..5c5827ec2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=4.3.12 +VERSION=4.3.13 SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi # webapp diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 65b1398f0..77f2700fd 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -243,7 +243,7 @@ class SeedDMS_Core_DMS { $this->convertFileTypes = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '4.3.11'; + $this->version = '4.3.13'; } /* }}} */ /** diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 69d5dafed..4a98fb3b2 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2014-11-17 - + 2014-11-21 + - 4.3.12 - 4.3.12 + 4.3.13 + 4.3.13 stable @@ -24,7 +24,8 @@ GPL License -- fix searching folders with multivalue attributes +- fix searching for attributes +- add some more documentation @@ -733,5 +734,21 @@ new release - add method SeedDMS_Core_Attribute::getValueAsArray() + + 2014-11-17 + + + 4.3.12 + 4.3.12 + + + stable + stable + + GPL License + +- fix searching folders with multivalue attributes + + diff --git a/install/install.php b/install/install.php index 5d0a68070..b4791032c 100644 --- a/install/install.php +++ b/install/install.php @@ -119,7 +119,7 @@ function fileExistsInIncludePath($file) { /* {{{ */ * Load default settings + set */ define("SEEDDMS_INSTALL", "on"); -define("SEEDDMS_VERSION", "4.3.12"); +define("SEEDDMS_VERSION", "4.3.13"); require_once('../inc/inc.ClassSettings.php'); From dced01d02341c34ad1402c507bee5bcaccf253e8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 21 Nov 2014 12:03:00 +0100 Subject: [PATCH 3/6] various updates --- languages/ar_EG/lang.inc | 3 +++ languages/ca_ES/lang.inc | 3 +++ languages/cs_CZ/lang.inc | 5 ++++- languages/de_DE/lang.inc | 5 ++++- languages/en_GB/lang.inc | 5 ++++- languages/es_ES/lang.inc | 3 +++ languages/fr_FR/lang.inc | 3 +++ languages/hu_HU/lang.inc | 3 +++ languages/it_IT/lang.inc | 3 +++ languages/nl_NL/lang.inc | 3 +++ languages/pl_PL/lang.inc | 3 +++ languages/pt_BR/lang.inc | 3 +++ languages/ru_RU/lang.inc | 3 +++ languages/sk_SK/lang.inc | 3 +++ languages/sv_SE/lang.inc | 3 +++ languages/zh_CN/lang.inc | 3 +++ languages/zh_TW/lang.inc | 3 +++ 17 files changed, 54 insertions(+), 3 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index bae4d4687..259435ad8 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -124,10 +124,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - تم تغيير سمة', 'attribute_count' => 'ﻉﺩﺩ ﻡﺭﺎﺗ ﺍﻸﺴﺘﺧﺩﺎﻣ', 'attribute_value' => 'ﻖﻴﻣﺓ ﺎﻠﺴﻣﺓ', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => '', 'at_least_n_users_of_group' => '', 'august' => 'أغسطس', 'authentication' => '', +'author' => '', 'automatic_status_update' => 'تغير الحالة تلقائيا', 'back' => 'العودة للخلف', 'backup_list' => 'قائمة نسخ احتياطي حالية', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index a3e48248a..16d51beb4 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -109,10 +109,13 @@ $text = array( 'attribute_changed_email_subject' => '', 'attribute_count' => '', 'attribute_value' => '', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => '', 'at_least_n_users_of_group' => '', 'august' => 'Agost', 'authentication' => '', +'author' => '', 'automatic_status_update' => 'Canvi automátic d\'estat', 'back' => 'Endarrere', 'backup_list' => 'Llista de còpies de seguretat existents', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index ece82f3f0..b84e342ba 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (616), kreml (442) +// Translators: Admin (616), kreml (445) $text = array( 'accept' => 'Přijmout', @@ -131,10 +131,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Atributy změněny', 'attribute_count' => 'Počet použití', 'attribute_value' => 'Hodnota atributu', +'attr_max_values' => 'Maximální počet pažadovaných hodnot pro atribut [attrname] je překročen.', +'attr_min_values' => 'Není dosaženo minimálního počtu požadovaných hodnot pro atribut [attrname].', 'attr_no_regex_match' => 'Hodnota atributu nesouhlasí s regulárním výrazem', 'at_least_n_users_of_group' => 'Alespoň [number_of_users] uživatelů z [group]', 'august' => 'Srpen', 'authentication' => 'Autentizace', +'author' => 'Autor', 'automatic_status_update' => 'Automatická změna stavu', 'back' => 'Přejít zpět', 'backup_list' => 'Existující záložní seznam', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index ce4d76ab8..6b0c0d46e 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1911) +// Translators: Admin (1914) $text = array( 'accept' => 'Übernehmen', @@ -131,10 +131,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attribut geändert', 'attribute_count' => 'Anzahl Verwendungen', 'attribute_value' => 'Attributwert', +'attr_max_values' => 'Die maximale Anzahl der erlaubten Werte für das Attribut [attrname] ist überschritten.', +'attr_min_values' => 'Die minimal Anzahl von Werte für das Attribut [attrname] ist nicht erreicht.', 'attr_no_regex_match' => 'The attribute value does not match the regular expression', 'at_least_n_users_of_group' => 'Mindestens [number_of_users] Benutzer der Gruppe [group]', 'august' => 'August', 'authentication' => 'Authentifizierung', +'author' => 'Autor', 'automatic_status_update' => 'Automatischer Statuswechsel', 'back' => 'Zurück', 'backup_list' => 'Liste vorhandener Backups', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index e918eef52..fb36d3968 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1049), netixw (14) +// Translators: Admin (1052), netixw (14) $text = array( 'accept' => 'Accept', @@ -131,10 +131,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attribute changed', 'attribute_count' => 'Number of uses', 'attribute_value' => 'Value of attribute', +'attr_max_values' => 'The maximum number of required values for attributes [attrname] is exceeded.', +'attr_min_values' => 'The minimum number of required values for attributes [attrname] is not reached.', 'attr_no_regex_match' => 'The attribute value does not match the regular expression', 'at_least_n_users_of_group' => 'At least [number_of_users] users of [group]', 'august' => 'August', 'authentication' => 'Authentication', +'author' => 'Author', 'automatic_status_update' => 'Automatic status change', 'back' => 'Go back', 'backup_list' => 'Existings backup list', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 2b8dfd405..c4be8157b 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -131,10 +131,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Atributo modificado', 'attribute_count' => 'Cantidad de usos', 'attribute_value' => 'Valor del atributo', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => 'El valor del atributo no concuerda con la expresión regular', 'at_least_n_users_of_group' => 'Al menos [number_of_users] usuarios de [group]', 'august' => 'Agosto', 'authentication' => 'Autenticación', +'author' => '', 'automatic_status_update' => 'Cambio automático de estado', 'back' => 'Atrás', 'backup_list' => 'Lista de copias de seguridad existentes', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index d44906686..a299d76f7 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -124,10 +124,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attribut changé', 'attribute_count' => 'Nombre d\'utilisations', 'attribute_value' => 'Valeur de l\'attribut', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => 'La valeur de l\'attribut ne correspond pas à l\'expression régulière.', 'at_least_n_users_of_group' => '', 'august' => 'Août', 'authentication' => 'Authentification', +'author' => '', 'automatic_status_update' => 'Changement de statut automatique', 'back' => 'Retour', 'backup_list' => 'Liste de sauvegardes existantes', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index f7f473598..f3f00511e 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -131,10 +131,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Jellemző módosult', 'attribute_count' => 'Felhasználók száma', 'attribute_value' => 'Tulajdonság értéke', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => 'A jellemző értéke nem felel meg a szabályos kifejezésnek', 'at_least_n_users_of_group' => 'Legalább [number_of_users] felhasználó a [group] csoportban', 'august' => 'Augusztus', 'authentication' => 'Hitelesítés', +'author' => '', 'automatic_status_update' => 'Automatikus állapot változás', 'back' => 'Vissza', 'backup_list' => 'Meglévő mentések listája', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 346d86158..a3577f1da 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -109,10 +109,13 @@ $text = array( 'attribute_changed_email_subject' => '', 'attribute_count' => 'Numero di utenti', 'attribute_value' => 'Valore dell\'attributo', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => '', 'at_least_n_users_of_group' => '', 'august' => 'Agosto', 'authentication' => '', +'author' => '', 'automatic_status_update' => 'Modifica automatica dello stato', 'back' => 'Ritorna', 'backup_list' => 'Lista dei backup presenti', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 9c4af5c9a..e9e185b1c 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -124,10 +124,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attribuut gewijzigd', 'attribute_count' => 'Aantal maal gebruikt', 'attribute_value' => 'Waarde van het attribuut', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => 'De waarde van het attribuut komt niet overeen met de veelgebruikte uitdrukking (regular expression)', 'at_least_n_users_of_group' => 'Minimaal [number_of_users] gebruikers van [group]', 'august' => 'augustus', 'authentication' => '', +'author' => '', 'automatic_status_update' => 'Automatische Status wijziging', 'back' => 'Terug', 'backup_list' => 'Bestaande backup lijst', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index c419c3d21..151a2ed39 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -124,10 +124,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Zmiana atrybutu', 'attribute_count' => 'liczba użyć', 'attribute_value' => 'wartość atrybutu', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => 'Wartość atrybutu nie pasuje do wyrażenia regularnego', 'at_least_n_users_of_group' => 'Przynajmniej [number_of_users] użytkowników grupy [group]', 'august' => 'Sierpień', 'authentication' => '', +'author' => '', 'automatic_status_update' => 'Automatyczna zmiana statusu', 'back' => 'Powrót', 'backup_list' => 'Lista istniejących kopii zapasowych', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 86f87ab8f..dae02530a 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -131,10 +131,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Atributo modificado', 'attribute_count' => 'Número de utilizações', 'attribute_value' => 'Valor do atributo', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => 'O valor do atributo não corresponde à expressão regular', 'at_least_n_users_of_group' => 'Pelo menos [nuber_of_users] usuários de [group]', 'august' => 'August', 'authentication' => 'Autenticação', +'author' => '', 'automatic_status_update' => 'Mudança de status automático', 'back' => 'Voltar', 'backup_list' => 'Existings backup list', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index bce311b4c..cfea27ef9 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -124,10 +124,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: изменён атрибут «[name]»', 'attribute_count' => 'Использован раз', 'attribute_value' => 'Значение атрибута', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => 'Значение атрибута не соответствует регулярному выражению', 'at_least_n_users_of_group' => '[number_of_users] польз. группы [group]', 'august' => 'Август', 'authentication' => '', +'author' => '', 'automatic_status_update' => 'Автоматическое изменение статуса', 'back' => 'Назад', 'backup_list' => 'Список резервных копий', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 49a5dad59..9f02ae9f4 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -109,10 +109,13 @@ $text = array( 'attribute_changed_email_subject' => '', 'attribute_count' => '', 'attribute_value' => '', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => '', 'at_least_n_users_of_group' => '', 'august' => 'August', 'authentication' => '', +'author' => '', 'automatic_status_update' => 'Automaticka zmena stavu', 'back' => 'Prejsť späť', 'backup_list' => 'Zoznam záloh', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 6431c9a3b..fd40dce5d 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -124,10 +124,13 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Ändrad attribut', 'attribute_count' => 'Antal användningar', 'attribute_value' => 'Attributvärde', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => 'Värdet av attributet stämmer inte överens med regulära uttrycket', 'at_least_n_users_of_group' => 'Åtminstone [number_of_users] användare av [group]', 'august' => 'augusti', 'authentication' => '', +'author' => '', 'automatic_status_update' => 'Automatisk ändring av status', 'back' => 'Tillbaka', 'backup_list' => 'Befintliga backup-filer', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 5685e8f35..b4ba90516 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -113,10 +113,13 @@ URL: [url]', 'attribute_changed_email_subject' => '', 'attribute_count' => '使用次数', 'attribute_value' => '属性值', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => '', 'at_least_n_users_of_group' => '', 'august' => '八 月', 'authentication' => '', +'author' => '', 'automatic_status_update' => '自动状态变化', 'back' => '返回', 'backup_list' => '备份列表', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 914369115..bce36774a 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -113,10 +113,13 @@ URL: [url]', 'attribute_changed_email_subject' => '', 'attribute_count' => '使用次數', 'attribute_value' => '屬性值', +'attr_max_values' => '', +'attr_min_values' => '', 'attr_no_regex_match' => '', 'at_least_n_users_of_group' => '', 'august' => '八 月', 'authentication' => '', +'author' => '', 'automatic_status_update' => '自動狀態變化', 'back' => '返回', 'backup_list' => '備份列表', From 1cb1ffb43699a7516f36d294303afa751ab9fe29 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Nov 2014 13:11:00 +0100 Subject: [PATCH 4/6] add button to select all files --- views/bootstrap/class.LogManagement.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php index 22b764f8b..9e5800c55 100644 --- a/views/bootstrap/class.LogManagement.php +++ b/views/bootstrap/class.LogManagement.php @@ -67,6 +67,18 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style { if ($print_header) printMLText("empty_notify_list"); else print "\n"; + echo "\n"; } /* }}} */ function show() { /* {{{ */ From 4dade8e5cdb4ab64b2b02230d42972d395570a6f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Nov 2014 13:11:29 +0100 Subject: [PATCH 5/6] set propper last modification time --- webdav/webdav.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/webdav/webdav.php b/webdav/webdav.php index 544e7c3cc..3c3b8162e 100644 --- a/webdav/webdav.php +++ b/webdav/webdav.php @@ -276,12 +276,11 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $info = array(); $info["props"] = array(); - // modification time - $info["props"][] = $this->mkprop("getlastmodified", time()); - // type and size (caller already made sure that path exists) if (get_class($obj) == 'SeedDMS_Core_Folder') { + // modification time /* folders do not have a modification time */ + $info["props"][] = $this->mkprop("getlastmodified", time()); $info["props"][] = $this->mkprop("creationdate", time()); // directory (WebDAV collection) @@ -301,6 +300,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server $info["props"][] = $this->mkprop("resourcetype", "collection"); $info["props"][] = $this->mkprop("getcontenttype", "httpd/unix-directory"); } else { + // modification time + $info["props"][] = $this->mkprop("getlastmodified",$obj->getLatestContent()->getDate()); $info["props"][] = $this->mkprop("creationdate", $obj->getDate()); // plain file (WebDAV resource) From 0d4f9ad49a865d6c4dc545950d6847e63b0f4030 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Nov 2014 13:12:21 +0100 Subject: [PATCH 6/6] add changes for 4.3.13 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 494eec5ad..f53f7e6b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,8 @@ -------------------------------------------------------------------------------- - more error fixes when searching for attributes - fix saving multi value attributes without a maximum number of values +- webdav sets propper modification time +- add button to select all log files for removal -------------------------------------------------------------------------------- Changes in version 4.3.12