Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -204,11 +204,13 @@
 - output format for dates can be configured
 - add filter function to notification service
 - reindex document after it was edited
-- show preview images in drop folder menu after mouse over
+- show preview images in drop folder menu on mouse over
 - add support for indexing folders in fulltext search
 - add support for start folder in fulltext search
 - always call hook postAddSubFolder and postEditDocument
 - call each notification service even if one of them fails
+- support partial content downloads (useful for embedding videos)
+- unfold all folders within current path in jqtree
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20

SeedDMS_Core/Core/inc.ClassDocument.php

@@ -1896,12 +1896,19 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if($attributes) {
 			foreach($attributes as $attrdefid=>$attribute) {
 				/* $attribute can be a string or an array */
-				if($attribute)
+				if($attribute) {
-					if(!$content->setAttributeValue($this->_dms->getAttributeDefinition($attrdefid), $attribute)) {
+					if($attrdef = $this->_dms->getAttributeDefinition($attrdefid)) {
+						if(!$content->setAttributeValue($attrdef, $attribute)) {
+							$this->_removeContent($content);
+							$db->rollbackTransaction();
+							return false;
+						}
+					} else {
 						$this->_removeContent($content);
 						$db->rollbackTransaction();
 						return false;
 					}
+				}
 			}
 		}
 

SeedDMS_Core/Core/inc.ClassFolder.php

@@ -700,7 +700,12 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		if($attributes) {
 			foreach($attributes as $attrdefid=>$attribute) {
 				if($attribute)
-					if(!$newFolder->setAttributeValue($this->_dms->getAttributeDefinition($attrdefid), $attribute)) {
+					if($attrdef = $this->_dms->getAttributeDefinition($attrdefid)) {
+						if(!$newFolder->setAttributeValue($attrdef, $attribute)) {
+							$db->rollbackTransaction();
+							return false;
+						}
+					} else {
 						$db->rollbackTransaction();
 						return false;
 					}
@@ -1027,12 +1032,19 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		if($attributes) {
 			foreach($attributes as $attrdefid=>$attribute) {
 				/* $attribute can be a string or an array */
-				if($attribute)
+				if($attribute) {
-					if(!$document->setAttributeValue($this->_dms->getAttributeDefinition($attrdefid), $attribute)) {
+					if($attrdef = $this->_dms->getAttributeDefinition($attrdefid)) {
+						if(!$document->setAttributeValue($attrdef, $attribute)) {
+							$document->remove();
+							$db->rollbackTransaction();
+							return false;
+						}
+					} else {
 						$document->remove();
 						$db->rollbackTransaction();
 						return false;
 					}
+				}
 			}
 		}
 

SeedDMS_Core/package.xml

@@ -1859,6 +1859,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
 - new paramter 'new' of methode SeedDMЅ_Core_AttributeDefinition::validate()
 - check if folder/document is below rootDir can be turned on (default off)
 - SeedDMS_Core_User::setHomeFolder() can be used to unset the home folder
+- check if attribute definition exists when setting attributes of folders and documents
    </notes>
   </release>
   <release>

languages/ar_EG/lang.inc

@@ -350,6 +350,7 @@ URL: [url]',
 'documents_locked' => 'مستندات مغلقة',
 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك',
 'documents_only' => 'مستندات فقط',
+'documents_rejected' => '',
 'documents_to_approve' => 'مستندات في انتظار الموافقة',
 'documents_to_correct' => 'مستندات للتصحيح',
 'documents_to_process' => 'مستندات للمعالجة',
@@ -391,6 +392,7 @@ Parent folder: [folder_path]
 'document_duplicate_name' => 'اسم المستند متكرر',
 'document_has_no_workflow' => 'المستند لايحتوى مسار عمل',
 'document_infos' => 'معلومات المستند',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'تم سحب المستند',
 'document_is_not_locked' => 'هذا المستند غير محمي ضد التعديل',

languages/bg_BG/lang.inc

@@ -333,6 +333,7 @@ $text = array(
 'documents_locked' => '',
 'documents_locked_by_you' => 'Документи, блокирани от Вас',
 'documents_only' => 'Само документи',
+'documents_rejected' => '',
 'documents_to_approve' => 'Документи, чакащи Вашето утвърждаване',
 'documents_to_correct' => '',
 'documents_to_process' => '',
@@ -365,6 +366,7 @@ $text = array(
 'document_duplicate_name' => 'Дублирано име на документ',
 'document_has_no_workflow' => 'Документът няма процес',
 'document_infos' => 'Информация за документа',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => '',
 'document_is_not_locked' => 'Документът не е блокиран',

languages/ca_ES/lang.inc

@@ -338,6 +338,7 @@ URL: [url]',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
 'documents_only' => 'Només documents',
+'documents_rejected' => '',
 'documents_to_approve' => 'Documents en espera d\'aprovació d\'usuaris',
 'documents_to_correct' => '',
 'documents_to_process' => '',
@@ -370,6 +371,7 @@ URL: [url]',
 'document_duplicate_name' => '',
 'document_has_no_workflow' => '',
 'document_infos' => 'Informacions',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => '',
 'document_is_not_locked' => 'Aquest document no està bloquejat',

languages/cs_CZ/lang.inc

@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => 'Uzamčené dokumenty',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
 'documents_only' => 'Pouze dokumenty',
+'documents_rejected' => '',
 'documents_to_approve' => 'Dokumenty čekající na schválení uživatele',
 'documents_to_correct' => 'Dokumenty, které potřebují opravu',
 'documents_to_process' => 'Dokumenty, které potřebují zpracování',
@@ -410,6 +411,7 @@ Uživatel: [username]',
 'document_duplicate_name' => 'Duplicitní název dokumentu',
 'document_has_no_workflow' => 'Dokument nemá workflow',
 'document_infos' => 'Informace o dokumentu',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Dokument je aktuálně zkontrolován. Pokud nahrajete novou verzi, nemůžete již kontrolovanou verzi zkontrolovat.',
 'document_is_not_locked' => 'Tento dokument není zamčený',

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 (2847), dgrutsch (22)
+//    Translators: Admin (2848), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => 'Gesperrte Dokumente',
 'documents_locked_by_you' => 'Von mir gesperrte Dokumente',
 'documents_only' => 'Nur Dokumente',
+'documents_rejected' => 'Abgelehnt',
 'documents_to_approve' => 'Freigabe erforderlich',
 'documents_to_correct' => 'Korrektur erforderlich',
 'documents_to_process' => 'Dokumente, die bearbeitet werden müssen',
@@ -410,6 +411,7 @@ Benutzer: [username]',
 'document_duplicate_name' => 'Doppelter Dokumentenname',
 'document_has_no_workflow' => 'Dokument hat keinen Workflow',
 'document_infos' => 'Informationen',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => 'Das Dokument ist zur Zeit ausgecheckt. Wenn Sie das Dokument löschen kann die ausgecheckte Version nicht mehr hochgeladen werden und verbleibt im Auscheck-Bereich.',
 'document_is_checked_out_update' => 'Das Dokument ist zur Zeit ausgecheckt. Wenn Sie eine neue Version hochladen, werden Sie die ausgecheckte Version nicht mehr einchecken können.',
 'document_is_not_locked' => 'Dieses Dokument ist nicht gesperrt',

languages/el_GR/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 (343)
+//    Translators: Admin (347)
 
 $text = array(
 '2_factor_auth' => '',
@@ -307,7 +307,7 @@ $text = array(
 'daily' => '',
 'databasesearch' => '',
 'database_schema_version' => '',
-'data_loading' => '',
+'data_loading' => 'Αναμονή φόρτωσης δεδομένων...',
 'date' => 'Ημερομηνία',
 'days' => 'μέρες',
 'debug' => '',
@@ -333,6 +333,7 @@ $text = array(
 'documents_locked' => '',
 'documents_locked_by_you' => '',
 'documents_only' => 'Έγγραφα μόνο',
+'documents_rejected' => '',
 'documents_to_approve' => '',
 'documents_to_correct' => '',
 'documents_to_process' => '',
@@ -365,6 +366,7 @@ $text = array(
 'document_duplicate_name' => '',
 'document_has_no_workflow' => '',
 'document_infos' => 'Πληροφορίες Εγγράφου',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => '',
 'document_is_not_locked' => '',
@@ -426,7 +428,7 @@ $text = array(
 'dump_remove' => '',
 'duplicates' => '',
 'duplicate_content' => '',
-'edit' => '',
+'edit' => 'Επεξεργασία',
 'edit_attributes' => '',
 'edit_comment' => 'Επεξερασία σχόλιου',
 'edit_default_keywords' => '',
@@ -683,7 +685,7 @@ $text = array(
 'linked_documents' => 'Σχετικά Έγγραφα',
 'linked_files' => 'Συνδεμένα αρχεία',
 'linked_to_current_version' => '',
-'linked_to_document' => '',
+'linked_to_document' => 'Συνδεδεμένο με το έγγραφο',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '',
 'link_document' => '',
@@ -758,7 +760,7 @@ $text = array(
 'new_attrdef' => '',
 'new_default_keywords' => '',
 'new_default_keyword_category' => 'Προσθήκη Κατηγορίας',
-'new_document_category' => '',
+'new_document_category' => 'Προσθήκη κατηγορίας',
 'new_document_email' => 'Νέο Έγγραφο',
 'new_document_email_body' => 'Νέο έγγραφο
 Name: [name]

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 (1955), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1956), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => 'Locked documents',
 'documents_locked_by_you' => 'Documents locked by you',
 'documents_only' => 'Documents only',
+'documents_rejected' => 'Rejected',
 'documents_to_approve' => 'Documents awaiting your approval',
 'documents_to_correct' => 'Documents that need correction',
 'documents_to_process' => 'Documents that need processing',
@@ -410,6 +411,7 @@ User: [username]',
 'document_duplicate_name' => 'Duplicate document name',
 'document_has_no_workflow' => 'Document has no workflow',
 'document_infos' => 'Document Information',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => 'Document is currently checked out. If you delete the document, the checked out version can not be added anymore and remains in the checkout area.',
 'document_is_checked_out_update' => 'Document is currently checked out. If you upload a new version, then the checked out version cannot be checked back in anymore.',
 'document_is_not_locked' => 'This document is not locked',

languages/es_ES/lang.inc

@@ -357,6 +357,7 @@ URL: [url]',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por usted',
 'documents_only' => 'Solo documentos',
+'documents_rejected' => '',
 'documents_to_approve' => 'Documentos en espera de aprobación de usuarios',
 'documents_to_correct' => '',
 'documents_to_process' => '',
@@ -398,6 +399,7 @@ Usuario: [username]',
 'document_duplicate_name' => 'Nombre de documento duplicado',
 'document_has_no_workflow' => 'Documento sin flujo de trabajo',
 'document_infos' => 'Informaciones',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => '',
 'document_is_not_locked' => 'Este documento no está bloqueado',

languages/fr_FR/lang.inc

@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => 'Documents verrouillés',
 'documents_locked_by_you' => 'Documents verrouillés',
 'documents_only' => 'Documents uniquement',
+'documents_rejected' => '',
 'documents_to_approve' => 'Documents en attente d\'approbation',
 'documents_to_correct' => 'Documents à corriger',
 'documents_to_process' => 'Documents à traiter',
@@ -410,6 +411,7 @@ Utilisateur : [username]',
 'document_duplicate_name' => 'Un document porte déjà ce nom !',
 'document_has_no_workflow' => 'Le document n\'a pas de workflow',
 'document_infos' => 'Informations sur le document',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Le document est actuellement bloqué. Si vous ajoutez une nouvelle version, la version bloquée ne pourra plus être débloquée.',
 'document_is_not_locked' => 'Ce document n\'est pas verrouillé',

languages/hr_HR/lang.inc

@@ -362,6 +362,7 @@ Internet poveznica: [url]',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenti koje ste vi zaključali',
 'documents_only' => 'Samo dokumenti',
+'documents_rejected' => '',
 'documents_to_approve' => 'Dokumenti koji čekaju vaše odobrenje',
 'documents_to_correct' => '',
 'documents_to_process' => '',
@@ -403,6 +404,7 @@ Korisnik: [username]',
 'document_duplicate_name' => 'Duplicate document name',
 'document_has_no_workflow' => 'Dokument nema tok rada',
 'document_infos' => 'Informacije o dokumentu',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Dokument je trenutno odjavljen. Ako učitate novu verziju, tada odjavljena verzija ne može više biti ponovno prijavljena.',
 'document_is_not_locked' => 'Ovaj dokument nije zaključan',

languages/hu_HU/lang.inc

@@ -357,6 +357,7 @@ URL: [url]',
 'documents_locked' => 'dokumentum zárolva',
 'documents_locked_by_you' => 'Ön által zárolt dokumentumok',
 'documents_only' => 'Csak dokumentumok',
+'documents_rejected' => '',
 'documents_to_approve' => 'Jóváhagyására váró dokumentumok',
 'documents_to_correct' => '',
 'documents_to_process' => '',
@@ -398,6 +399,7 @@ Felhasználó: [username]',
 'document_duplicate_name' => 'Duplikált dokumentum név',
 'document_has_no_workflow' => 'Dokumentumhoz nincs munkafolyamat',
 'document_infos' => 'Dokumentum információ',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => '',
 'document_is_not_locked' => 'Ez a dokumentum NEM zßrolt',

languages/it_IT/lang.inc

@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => 'Documenti bloccati',
 'documents_locked_by_you' => 'Documenti bloccati da te',
 'documents_only' => 'Solo documenti',
+'documents_rejected' => '',
 'documents_to_approve' => 'Documenti in attesa della tua approvazione',
 'documents_to_correct' => 'Documenti in attesa della tua correzione',
 'documents_to_process' => 'I documenti che necessitano di trattamento',
@@ -403,6 +404,7 @@ Utente: [username]',
 'document_duplicate_name' => 'Nome del Documento duplicato',
 'document_has_no_workflow' => 'Il documento non ha un flusso di lavoro',
 'document_infos' => 'Informazioni documento',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Il documento é approvato. Se aggiorni il documento, la versione approvata verrà sovrascritta definitivamente',
 'document_is_not_locked' => 'Questo documento non è bloccato',

languages/ko_KR/lang.inc

@@ -365,6 +365,7 @@ URL: [url]',
 'documents_locked' => '잠긴 문서',
 'documents_locked_by_you' => '당신에 의해 잠긴 문서',
 'documents_only' => '문서',
+'documents_rejected' => '',
 'documents_to_approve' => '당신의 승인을 기다리는 문서들',
 'documents_to_correct' => '',
 'documents_to_process' => '문서처리',
@@ -406,6 +407,7 @@ URL: [url]',
 'document_duplicate_name' => '중복 문서 이름',
 'document_has_no_workflow' => '문서에 워크플로우가 없습니다',
 'document_infos' => '문서 정보',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => '문서가 현재 체크아웃 되어 있습니다. 새 버전을 업로드하면 체크아웃된 버전은 더 이상 확인 할 수 없습니다.',
 'document_is_not_locked' => '잠겨 있지 않은 문서',

languages/lo_LA/lang.inc

@@ -360,6 +360,7 @@ URL: [url]',
 'documents_locked' => 'ເອກະສານທີ່ຖືກລັອກ',
 'documents_locked_by_you' => 'ເອກະສານນີ້ແມ່ນເຈົ້າເປັນຄົນລັອກ',
 'documents_only' => 'ເອກະສານຢ່າງດຽວ',
+'documents_rejected' => '',
 'documents_to_approve' => 'ເອກະສານທີ່ລໍຖ້າອະນຸມັດຈາກທ່ານ',
 'documents_to_correct' => '',
 'documents_to_process' => 'ເອກະສານທີ່ຢູ່ໃນຂັ້ນຕອນການດຳເນີນງານ',
@@ -401,6 +402,7 @@ URL: [url]',
 'document_duplicate_name' => 'ຊື່ເອກະສານຊໍ້າ',
 'document_has_no_workflow' => 'ເອກະສານບໍ່ມີເວີກໂຟ',
 'document_infos' => 'ຂໍ້ມູນເອກະສານ',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'ຂະນະນີ້ມີການກວດສອບເອກະສານ ຫາກເຈົ້າອັບໂຫລດເວີຊັນໄຫມ່ລະບົບຈະບໍ່ສາມາດກວດສອບລະບົບທີປິດອອກໄດ້ອີກຕໍ່ໄປ',
 'document_is_not_locked' => 'ເອກະສານນີ້ແມ່ນບໍ່ໄດ້ລັອກ',

languages/nb_NO/lang.inc

@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => 'Låste dokumenter',
 'documents_locked_by_you' => 'Dokumenter som du har låst',
 'documents_only' => 'Bare dokumenter',
+'documents_rejected' => '',
 'documents_to_approve' => 'Dokumenter som venter på din godkjenning',
 'documents_to_correct' => 'Dokumenter som trenger dine rettelser',
 'documents_to_process' => 'Dokumenter som trenger din behandling',
@@ -410,6 +411,7 @@ Bruker: [username]',
 'document_duplicate_name' => 'Dupliser dokumentnavn',
 'document_has_no_workflow' => 'Dokumentet har ingen arbeidsflyt',
 'document_infos' => 'Dokumentinformation',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Dokumentet er allerede utsjekket. Hvis du laster opp en ny version kan den utsjekkede versionen ikke sjekkes inn igen.',
 'document_is_not_locked' => 'Dette dokumentet er ikke låst',

languages/pl_PL/lang.inc

@@ -350,6 +350,7 @@ URL: [url]',
 'documents_locked' => 'Dokumenty zablokowane',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
 'documents_only' => 'Tylko dokumenty',
+'documents_rejected' => '',
 'documents_to_approve' => 'Dokumenty oczekujące na Twoje zatwierdzenie',
 'documents_to_correct' => 'Dokumenty oczekujące na Twoje korekty',
 'documents_to_process' => 'Dokumenty oczekujące na Twoje przetworzenie',
@@ -391,6 +392,7 @@ Użytkownik: [username]',
 'document_duplicate_name' => 'Zduplikowana nazwa dokumentu',
 'document_has_no_workflow' => 'Dokument nie ma przypisanego procesu',
 'document_infos' => 'Informacje o dokumencie',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Ten dokument jest pobierany',
 'document_is_not_locked' => 'Ten dokument nie jest zablokowany',

languages/pt_BR/lang.inc

@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => 'Documentos bloqueados',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
 'documents_only' => 'Somente documentos',
+'documents_rejected' => '',
 'documents_to_approve' => 'Documentos aguardando sua aprovação',
 'documents_to_correct' => 'Documentos que precisam de correção',
 'documents_to_process' => 'Documentos que precisam de processamento',
@@ -410,6 +411,7 @@ Usuário: [username]',
 'document_duplicate_name' => 'Duplicar nome do documento',
 'document_has_no_workflow' => 'Documento não tem fluxo de trabalho',
 'document_infos' => 'Informações',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'O documento está atualmente com estado de retirado. Se você fizer o envio de uma nova versão, a versão retirada não poderá mais ser registrada.',
 'document_is_not_locked' => 'Este documento não está travado',

languages/ro_RO/lang.inc

@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documente blocate de tine',
 'documents_only' => 'Doar documente',
+'documents_rejected' => '',
 'documents_to_approve' => 'Documente care așteaptă aprobarea dumneavoastră',
 'documents_to_correct' => '',
 'documents_to_process' => '',
@@ -403,6 +404,7 @@ Utilizator: [username]',
 'document_duplicate_name' => 'Nume document duplicat',
 'document_has_no_workflow' => 'Documentul nu are workflow',
 'document_infos' => 'Informații document',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Documentul este in prezent verificat. Daca incarcati o noua versiune, versiunea verificata nu mai poate fi verificata din nou.',
 'document_is_not_locked' => 'Acest document nu este blocat',

languages/ru_RU/lang.inc

@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => 'Заблокированные документы',
 'documents_locked_by_you' => 'Документы, заблокированные вами',
 'documents_only' => 'Только документы',
+'documents_rejected' => '',
 'documents_to_approve' => 'Документы, ожидающие вашего утверждения',
 'documents_to_correct' => '',
 'documents_to_process' => 'Документы требующие обработки',
@@ -403,6 +404,7 @@ URL: [url]',
 'document_duplicate_name' => 'Одноимённый документ уже существует.',
 'document_has_no_workflow' => 'Для документа не назначен процесс',
 'document_infos' => 'Информация о документе',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Документ в настоящее время проверяется. Если вы загрузить новую версию, то проверяемая версия не может быть возвращена обратно.',
 'document_is_not_locked' => 'Документ не заблокирован',

languages/sk_SK/lang.inc

@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => 'Zamknuté dokumenty',
 'documents_locked_by_you' => 'Vami uzamknuté dokumenty',
 'documents_only' => 'Iba dokumenty',
+'documents_rejected' => '',
 'documents_to_approve' => 'Dokumenty čakajúce na schválenie používateľa',
 'documents_to_correct' => 'Dokumenty, ktoré treba opraviť',
 'documents_to_process' => 'Dokumenty, ktoré potrebujú spracovanie',
@@ -410,6 +411,7 @@ Používateľ: [username]',
 'document_duplicate_name' => 'Duplicitný názov dokumentu',
 'document_has_no_workflow' => 'Dokument nemá pracovný postup',
 'document_infos' => 'Informácie o dokumente',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Document is currently checked out. If you upload a new version, then the checked out version cannot be checked back in anymore.',
 'document_is_not_locked' => 'Tento dokument nie je zamknutý',

languages/sv_SE/lang.inc

@@ -363,6 +363,7 @@ URL: [url]',
 'documents_locked' => 'Låsta dokument',
 'documents_locked_by_you' => 'Dokument som du har låst',
 'documents_only' => 'Endast dokument',
+'documents_rejected' => '',
 'documents_to_approve' => 'Dokument som du behöver godkänna',
 'documents_to_correct' => '',
 'documents_to_process' => 'Dokument som kräver åtgärd',
@@ -404,6 +405,7 @@ Användare: [username]',
 'document_duplicate_name' => 'Dubblett av dokumentnamn',
 'document_has_no_workflow' => 'Dokumentet saknar arbetsflöde',
 'document_infos' => 'Dokumentinformation',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Dokumentet är redan utcheckat. Om du laddar upp en ny version kan den utcheckade versionen inte checkas in igen.',
 'document_is_not_locked' => 'Detta dokument är inte låst',

languages/tr_TR/lang.inc

@@ -356,6 +356,7 @@ URL: [url]',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi',
 'documents_only' => 'Sadece dokümanlar',
+'documents_rejected' => '',
 'documents_to_approve' => 'Onayınızı bekleyen dokümanlar',
 'documents_to_correct' => '',
 'documents_to_process' => '',
@@ -397,6 +398,7 @@ Kullanıcı: [username]',
 'document_duplicate_name' => 'Mükerrer doküman ismi',
 'document_has_no_workflow' => 'Dokümanın iş akışı yok',
 'document_infos' => 'Doküman Bilgisi',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => '',
 'document_is_not_locked' => 'Bu doküman kilitli değil',

languages/uk_UA/lang.inc

@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => 'Заблоковані документи',
 'documents_locked_by_you' => 'Документи, які ви заблокували',
 'documents_only' => 'лише документи',
+'documents_rejected' => '',
 'documents_to_approve' => 'Документи, які чекають вашого затвердження',
 'documents_to_correct' => '',
 'documents_to_process' => 'Документи, які чекають опрацювання',
@@ -403,6 +404,7 @@ URL: [url]',
 'document_duplicate_name' => 'Документ з такою назвою вже існує',
 'document_has_no_workflow' => 'Документові не призначено процес',
 'document_infos' => 'Інформація про документ',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => 'Документ на опрацюванні',
 'document_is_not_locked' => 'Документ не заблокований',

languages/zh_CN/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 (773), archonwang (469), fengjohn (5), yang86 (1)
+//    Translators: Admin (774), archonwang (469), fengjohn (5), yang86 (1)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -356,6 +356,7 @@ URL: [url]',
 'documents_locked' => '已锁定的文档',
 'documents_locked_by_you' => '被您锁定的文档',
 'documents_only' => '指定文件',
+'documents_rejected' => '',
 'documents_to_approve' => '待您审核的文档',
 'documents_to_correct' => '',
 'documents_to_process' => '',
@@ -397,6 +398,7 @@ URL: [url]',
 'document_duplicate_name' => '文档名称重复',
 'document_has_no_workflow' => '文档未配置工作流',
 'document_infos' => '文档信息',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => '文档已签出。如上传了新版本，则已签出的版本则不能再被签回。',
 'document_is_not_locked' => '该文档没有被锁定',
@@ -1738,7 +1740,7 @@ URL: [url]',
 'status_revisor_removed' => '',
 'status_unknown' => '未知',
 'storage_size' => '存储大小',
-'subfolder_duplicate_name' => '',
+'subfolder_duplicate_name' => '重复的文件夹',
 'submit_2_fact_auth' => '',
 'submit_approval' => '提交审核',
 'submit_login' => '登录',

languages/zh_TW/lang.inc

@@ -362,6 +362,7 @@ URL: [url]',
 'documents_locked' => '文件鎖定',
 'documents_locked_by_you' => '被您鎖定的文件',
 'documents_only' => '指定檔',
+'documents_rejected' => '',
 'documents_to_approve' => '待您審核的文件',
 'documents_to_correct' => '需要更正的文件',
 'documents_to_process' => '需要處理的文件',
@@ -410,6 +411,7 @@ URL: [url]',
 'document_duplicate_name' => '文件名稱重複',
 'document_has_no_workflow' => '文件沒有工作流程',
 'document_infos' => '文件資訊',
+'document_is_checked_out' => '',
 'document_is_checked_out_remove' => '',
 'document_is_checked_out_update' => '當前已簽出文檔。如果您上傳新版本，那麼簽出的版本將無法再簽回。',
 'document_is_not_locked' => '該文件沒有被鎖定',

views/bootstrap/class.Bootstrap.php

@@ -2052,7 +2052,8 @@ $(document).ready(function() {
 				}
 				foreach($subfolders as $subfolder) {
 					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>(1 && ($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs))) ? true : false, 'is_folder'=>true);
-					if(/*$expandtree>=$level ||*/ $pathfolder->getID() == $subfolder->getID()) {
+					/* if the subfolder is in the path then further unfold the tree. */
+					if(/*$expandtree>=$level ||*/ $path && ($path[0]->getID() == $subfolder->getID())) {
 						$node['children'] = jqtree($obj, $path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
 						if($showdocs) {
 							$documents = $subfolder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);

views/bootstrap/class.DropFolderChooser.php

@@ -86,7 +86,7 @@ $('.folderselect').click(function(ev) {
 								if($previewwidth) {
 									$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
 									if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
-										$filecontent .= "<div class=\"dropfolder-menu-img\" style=\"_float: left; display: none; _width:40px; _max-height:40px;overflow:hidden;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
+										$filecontent .= "<div class=\"dropfolder-menu-img\" style=\"display: none; overflow:hidden; position: absolute; left:-".($previewwidth+10)."px; border: 1px solid #888;background: white;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
 									}
 								}
 								$filecontent .= "<div class=\"dropfolder-menu-text\" style=\"margin-left:10px; margin-right: 10px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div></a></li>\n";