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

CHANGELOG

@@ -382,6 +382,7 @@
 - migrate extension after enabling it with console tool
 - add browser detection on info page
 - tables on 'Charts' page can be sorted by clicking on column header
+- can switch to new folder after creating it
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.44

languages/ar_EG/lang.inc

@@ -274,6 +274,7 @@ URL: [url]',
 'change_recipients' => 'تغيير المستلمين',
 'change_revisors' => 'تغيير المراجعين',
 'change_status' => 'تغيير الحالة',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'عنوان الجدول',

languages/bg_BG/lang.inc

@@ -261,6 +261,7 @@ $text = array(
 'change_recipients' => '',
 'change_revisors' => '',
 'change_status' => 'Промени статусът',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Брой документи',

languages/ca_ES/lang.inc

@@ -266,6 +266,7 @@ URL: [url]',
 'change_recipients' => '',
 'change_revisors' => '',
 'change_status' => 'Canviar estat',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => '',

languages/cs_CZ/lang.inc

@@ -286,6 +286,7 @@ URL: [url]',
 'change_recipients' => 'Změnit příjemce',
 'change_revisors' => 'Nastavit kontrolory',
 'change_status' => 'Změna stavu',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Počet dokumentů',

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 (3600), dgrutsch (22)
+//    Translators: Admin (3601), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -319,6 +319,7 @@ URL: [url]</p>',
 'change_recipients' => 'Setze Empfänger',
 'change_revisors' => 'Setze Wiederholungsprüfer',
 'change_status' => 'Status ändern',
+'change_to_new_folder' => 'In neuen Ordner wechseln',
 'changelog_loading' => 'Bitte warten, bis die Liste der Änderungen geladen ist …',
 'chart_docsaccumulated_first_col' => 'Datum',
 'chart_docsaccumulated_title' => 'Anzahl Dokumente',

languages/el_GR/lang.inc

@@ -261,6 +261,7 @@ $text = array(
 'change_recipients' => 'Ορισμός παραληπτών',
 'change_revisors' => '',
 'change_status' => 'Αλλαγή κατάστασης',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Αριθμός Εγγράφων',

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 (2667), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2668), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -319,6 +319,7 @@ URL: [url]</p>',
 'change_recipients' => 'Set recipients',
 'change_revisors' => 'Set revisors',
 'change_status' => 'Change Status',
+'change_to_new_folder' => 'Change to new folder',
 'changelog_loading' => 'Please wait, until the change log is loaded …',
 'chart_docsaccumulated_first_col' => 'Date',
 'chart_docsaccumulated_title' => 'Number of documents',

languages/es_ES/lang.inc

@@ -281,6 +281,7 @@ URL: [url]',
 'change_recipients' => 'Definir destinatarios',
 'change_revisors' => 'Definir revisores',
 'change_status' => 'cambiar estado',
+'change_to_new_folder' => '',
 'changelog_loading' => 'Espere a que el registro de cambios se cargue ...',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Cantidad de documentos',

languages/fr_FR/lang.inc

@@ -310,6 +310,7 @@ URL : [url]</p>',
 'change_recipients' => 'Définir les destinataires',
 'change_revisors' => 'Définir les réviseurs',
 'change_status' => 'Modifier le statut',
+'change_to_new_folder' => '',
 'changelog_loading' => 'Veuillez patienter pendant le chargement du journal des modifications…',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Nombre de documents',

languages/hr_HR/lang.inc

@@ -286,6 +286,7 @@ Internet poveznica: [url]',
 'change_recipients' => 'Promijeni listu primatelja',
 'change_revisors' => 'Promijeni ponovno slanje',
 'change_status' => 'Promijeni status',
+'change_to_new_folder' => '',
 'changelog_loading' => 'Molim pričekajte dok se promjena učita …',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Broj dokumenata',

languages/hu_HU/lang.inc

@@ -281,6 +281,7 @@ URL: [url]',
 'change_recipients' => '',
 'change_revisors' => '',
 'change_status' => 'Állapot módosítása',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Dokumentumok száma',

languages/id_ID/lang.inc

@@ -290,6 +290,7 @@ URL: [url]</p>',
 'change_recipients' => 'Tetapkan penerima',
 'change_revisors' => 'Tetapkan revisor',
 'change_status' => 'Merubah Status',
+'change_to_new_folder' => '',
 'changelog_loading' => 'Harap tunggu, sampai log perubahan dimuat ...',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Jumlah dokumen',

languages/it_IT/lang.inc

@@ -286,6 +286,7 @@ URL: [url]',
 'change_recipients' => 'Cambia lista cartelle',
 'change_revisors' => 'Cambia reimmissione',
 'change_status' => 'Modifica lo stato',
+'change_to_new_folder' => '',
 'changelog_loading' => 'Attendi il caricamento del log modifiche',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Numero di documenti',

languages/ko_KR/lang.inc

@@ -288,6 +288,7 @@ URL: [url]',
 'change_recipients' => '수신자 목록 변경',
 'change_revisors' => '변경후 다시 제출',
 'change_status' => '상태 변경',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => '문서수',

languages/lo_LA/lang.inc

@@ -284,6 +284,7 @@ URL: [url]',
 'change_recipients' => 'ຕັ້ງຄ່າຜູ້ຮັບ',
 'change_revisors' => 'ຕັ້ງຄ່າການກວດສອບ',
 'change_status' => 'ປ່ຽນສະຖານະ',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'ເລກທີເອກະສານ',

languages/nb_NO/lang.inc

@@ -286,6 +286,7 @@ URL: [url]',
 'change_recipients' => 'Angi mottager',
 'change_revisors' => 'Angi korrekturleser',
 'change_status' => 'Endre status',
+'change_to_new_folder' => '',
 'changelog_loading' => 'Venligst vent til endringsloggen er lastet inn...',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Antall dokumenter',

languages/nl_NL/lang.inc

@@ -279,6 +279,7 @@ URL: [url]',
 'change_recipients' => 'Ontvanger(s) gewijzigd',
 'change_revisors' => 'redacteur',
 'change_status' => 'Wijzig Status',
+'change_to_new_folder' => '',
 'changelog_loading' => 'De change log word geladen …',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Aantal documenten',

languages/pl_PL/lang.inc

@@ -318,6 +318,7 @@ URL: [url]</p>',
 'change_recipients' => 'Zmień odbiorców',
 'change_revisors' => 'Zmień recenzentów',
 'change_status' => 'Zmień status',
+'change_to_new_folder' => '',
 'changelog_loading' => 'Poczekaj, aż dziennik zmian zostanie załadowany.',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Liczba dokumentów',

languages/pt_BR/lang.inc

@@ -286,6 +286,7 @@ URL: [url]',
 'change_recipients' => 'Definir destinatários',
 'change_revisors' => 'Definir revisores',
 'change_status' => 'Mudar status',
+'change_to_new_folder' => '',
 'changelog_loading' => 'Aguarde, até o log de alterações ser carregado…',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Número de documentos',

languages/ro_RO/lang.inc

@@ -286,6 +286,7 @@ URL: [url]',
 'change_recipients' => 'Schimba destinatari',
 'change_revisors' => 'Schimba retrimiterea',
 'change_status' => 'Schimbă status',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Numărul de documente',

languages/ru_RU/lang.inc

@@ -286,6 +286,7 @@ URL: [url]',
 'change_recipients' => 'Изменить список получателей',
 'change_revisors' => 'Изменить переподчинение',
 'change_status' => 'Изменить статус',
+'change_to_new_folder' => '',
 'changelog_loading' => 'Подождите, пока не загрузится журнал изменений',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Количество документов',

languages/sk_SK/lang.inc

@@ -286,6 +286,7 @@ URL: [url]',
 'change_recipients' => 'Nastaviť príjemcov',
 'change_revisors' => 'Nastaviť kontrolórov',
 'change_status' => 'Zmeniť stav',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Počet dokumentov',

languages/sv_SE/lang.inc

@@ -287,6 +287,7 @@ URL: [url]',
 'change_recipients' => 'Ange mottagare',
 'change_revisors' => 'Ange granskare',
 'change_status' => 'Ändra status',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Antal dokument',

languages/tr_TR/lang.inc

@@ -281,6 +281,7 @@ URL: [url]',
 'change_recipients' => 'Alıcıları değiştir',
 'change_revisors' => '',
 'change_status' => 'Değişme Durumu',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Doküman sayısı',

languages/uk_UA/lang.inc

@@ -286,6 +286,7 @@ URL: [url]',
 'change_recipients' => 'Змінити перелік одержувачів',
 'change_revisors' => 'Змінити перелік рецензентів',
 'change_status' => 'Змінити статус',
+'change_to_new_folder' => '',
 'changelog_loading' => '',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => 'Кількість документів',

languages/zh_CN/lang.inc

@@ -278,6 +278,7 @@ URL: [url]',
 'change_recipients' => '指定接收人',
 'change_revisors' => '指定修订人',
 'change_status' => '变更状态',
+'change_to_new_folder' => '',
 'changelog_loading' => '变更日志加载中,请稍候...',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => '文档数量',

languages/zh_TW/lang.inc

@@ -286,6 +286,7 @@ $text = array(
 'change_recipients' => '設置收件人',
 'change_revisors' => '設置修訂者',
 'change_status' => '變更狀態',
+'change_to_new_folder' => '',
 'changelog_loading' => '請等待，直到加載更改日誌為止……',
 'chart_docsaccumulated_first_col' => '',
 'chart_docsaccumulated_title' => '每月文件數量',

op/op.AddSubFolder.php

@@ -127,6 +127,10 @@ if(!$subFolder = $controller()) {
 
 add_log_line("?name=".$name."&folderid=".$folderid);
 
-header("Location:../out/out.ViewFolder.php?folderid=".$folderid."&showtree=".$_POST["showtree"]);
+if(!empty($_POST['change_to_new_folder'])) {
+	header("Location:../out/out.ViewFolder.php?folderid=".$subFolder->getId()."&showtree=".$_POST["showtree"]);
+} else {
+	header("Location:../out/out.ViewFolder.php?folderid=".$folderid."&showtree=".$_POST["showtree"]);
+}
 
 ?>

views/bootstrap/class.AddSubFolder.php

@@ -150,6 +150,14 @@ $(document).ready( function() {
 		}
 
 		$this->contentContainerEnd();
+		$this->formField(
+			getMLText("change_to_new_folder"),
+			array(
+				'element'=>'input',
+				'name'=>'change_to_new_folder',
+				'type'=>'checkbox',
+			)
+		);
 
 		/* FIXME: add section for adding notifications like in AddDocument */