diff --git a/CHANGELOG b/CHANGELOG index c125978b4..f108d75e6 100644 --- a/CHANGELOG +++ b/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 diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index cbcd5192b..612829003 100644 --- a/languages/ar_EG/lang.inc +++ b/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' => 'عنوان الجدول', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 091c8984a..8b2334997 100644 --- a/languages/bg_BG/lang.inc +++ b/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' => 'Брой документи', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 1f50452e6..6ced50e07 100644 --- a/languages/ca_ES/lang.inc +++ b/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' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index ae763cbf9..93b15f212 100644 --- a/languages/cs_CZ/lang.inc +++ b/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ů', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 403ab01b1..24ecb6d0d 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 (3600), dgrutsch (22) +// Translators: Admin (3601), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -319,6 +319,7 @@ URL: [url]

', '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', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index be1ed2708..4584a6b54 100644 --- a/languages/el_GR/lang.inc +++ b/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' => 'Αριθμός Εγγράφων', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 453f81849..4868f021a 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 (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]

', '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', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 29b51762f..7beae1c8f 100644 --- a/languages/es_ES/lang.inc +++ b/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', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 128dbf7e9..fee63b74e 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -310,6 +310,7 @@ URL : [url]

', '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', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index d3973c3de..c7b636d29 100644 --- a/languages/hr_HR/lang.inc +++ b/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', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 4078552bc..99335a8a6 100644 --- a/languages/hu_HU/lang.inc +++ b/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', diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc index 951208f3d..353d99342 100644 --- a/languages/id_ID/lang.inc +++ b/languages/id_ID/lang.inc @@ -290,6 +290,7 @@ URL: [url]

', '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', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 66107b4f1..e1d31baa6 100644 --- a/languages/it_IT/lang.inc +++ b/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', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 3933aa5f2..525391713 100644 --- a/languages/ko_KR/lang.inc +++ b/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' => '문서수', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index cf243d828..94a70c376 100644 --- a/languages/lo_LA/lang.inc +++ b/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' => 'ເລກທີເອກະສານ', diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc index 75ba92d3d..d5ea23cfa 100644 --- a/languages/nb_NO/lang.inc +++ b/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', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 3cc7f9e93..8ee9678b8 100644 --- a/languages/nl_NL/lang.inc +++ b/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', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index d0c374ad5..5d3b7a258 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -318,6 +318,7 @@ URL: [url]

', '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', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index cf37fe398..72babda1e 100644 --- a/languages/pt_BR/lang.inc +++ b/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', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 088bbc28b..0f8c5b644 100644 --- a/languages/ro_RO/lang.inc +++ b/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', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 5695e832c..5dd035993 100644 --- a/languages/ru_RU/lang.inc +++ b/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' => 'Количество документов', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index b556e0c79..b67f707ae 100644 --- a/languages/sk_SK/lang.inc +++ b/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', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index ccd0d902a..1aeee02dd 100644 --- a/languages/sv_SE/lang.inc +++ b/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', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 7b31dfc78..3e02bc5c6 100644 --- a/languages/tr_TR/lang.inc +++ b/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ı', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index cfa030629..68f48b2ae 100644 --- a/languages/uk_UA/lang.inc +++ b/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' => 'Кількість документів', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index e4770b0b2..d23ca1a90 100644 --- a/languages/zh_CN/lang.inc +++ b/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' => '文档数量', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index c514cc67f..126b39674 100644 --- a/languages/zh_TW/lang.inc +++ b/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' => '每月文件數量', diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php index 948b807fc..8aef09c59 100644 --- a/op/op.AddSubFolder.php +++ b/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"]); +} ?> diff --git a/views/bootstrap/class.AddSubFolder.php b/views/bootstrap/class.AddSubFolder.php index fea0a7f98..ec0c9677d 100644 --- a/views/bootstrap/class.AddSubFolder.php +++ b/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 */