diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index f440df80c..48ddc7e85 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -383,6 +383,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'تعديل المستخدم', 'edit_user_details' => 'تعديل بيانات المستخدم', +'edit_version' => '', 'email' => 'بريد الكتروني', 'email_error_title' => 'لمي يتم ادخال البريد الالكتروني', 'email_footer' => 'يمكنك دائما تغيير اعدادات بريدك الالكتروني من خلال خاصية - مستنداتي', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 525117d2e..6102f9ff0 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -338,6 +338,7 @@ $text = array( 'edit_transmittal_props' => '', 'edit_user' => 'Редактирай потребител', 'edit_user_details' => 'Редактирай данните на потребителя', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => 'Email не е указан', 'email_footer' => 'Винаги можете да измените e-mail исползвайки функцията \'Моя учетка\'', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 30ee44e87..4e62eed16 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -343,6 +343,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'Editar usuari...', 'edit_user_details' => 'Editar detalls d\'usuari', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => '', 'email_footer' => 'Sempre es pot canviar la configuració de correu electrònic utilitzant les funcions de «El meu compte»', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 5c5477f10..4a701b5a8 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 (705), kreml (455) +// Translators: Admin (706), kreml (455) $text = array( 'accept' => 'Přijmout', @@ -390,6 +390,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'Upravit uživatele', 'edit_user_details' => 'Upravit podrobnosti uživatele', +'edit_version' => '', 'email' => 'E-mail', 'email_error_title' => 'Není zadána emailová adresa', 'email_footer' => 'Změnu nastavení e-mailu můžete kdykoliv provést pomocí funkce\'Můj účet\'', @@ -1303,7 +1304,7 @@ URL: [url]', 'thursday' => 'Čtvrtek', 'thursday_abbr' => 'Čt', 'timeline' => 'časová os', -'timeline_add_file' => '', +'timeline_add_file' => 'Nová příloha', 'timeline_add_version' => '', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 7def977b8..d4904c1ff 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 (2218), dgrutsch (21) +// Translators: Admin (2219), dgrutsch (21) $text = array( 'accept' => 'Übernehmen', @@ -395,6 +395,7 @@ URL: [url]', 'edit_transmittal_props' => 'Attribute der Dokumentenliste bearbeiten', 'edit_user' => 'Benutzer bearbeiten', 'edit_user_details' => 'Benutzerdetails bearbeiten', +'edit_version' => 'Version editieren', 'email' => 'Email', 'email_error_title' => 'Keine E-Mail-Adresse eingegeben', 'email_footer' => 'Sie können zu jeder Zeit Ihre E-Mail-Adresse über \'Mein Profil\' ändern.', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 0b9bf2800..f1ff2669d 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 (1364), dgrutsch (7), netixw (14) +// Translators: Admin (1365), dgrutsch (7), netixw (14) $text = array( 'accept' => 'Accept', @@ -395,6 +395,7 @@ URL: [url]', 'edit_transmittal_props' => 'Edit transmittal properties', 'edit_user' => 'Edit user', 'edit_user_details' => 'Edit User Details', +'edit_version' => 'Edit version', 'email' => 'Email', 'email_error_title' => 'No email entered', 'email_footer' => 'You can always change your e-mail settings using \'My Account\' functions', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index fb8e67ba1..193bdfe65 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/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: acabello (20), Admin (990), angel (123), francisco (2), jaimem (14) +// Translators: acabello (20), Admin (991), angel (123), francisco (2), jaimem (14) $text = array( 'accept' => 'Aceptar', @@ -390,6 +390,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'Editar usuario...', 'edit_user_details' => 'Editar detalles de usuario', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => 'No ha introducido un correo', 'email_footer' => 'Siempre se puede cambiar la configuración de correo electrónico utilizando las funciones de «Mi cuenta»', @@ -1301,7 +1302,7 @@ URL: [url]', 'takeOverGrpApprover' => '', 'takeOverGrpReviewer' => '', 'takeOverIndApprover' => '', -'takeOverIndReviewer' => '', +'takeOverIndReviewer' => 'Tomar control de la revisión de la última versión', 'tasks' => '', 'testmail_body' => 'El propósito de este e-mail es probar la configuración del DMS', 'testmail_subject' => 'E-mail de prueba', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 614363fe7..07c4a9e53 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/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 (1028), jeromerobert (50), lonnnew (9) +// Translators: Admin (1029), jeromerobert (50), lonnnew (9) $text = array( 'accept' => 'Accepter', @@ -371,7 +371,7 @@ URL: [url]', 'dump_creation_warning' => 'Avec cette opération, vous pouvez créer une sauvegarde du contenu de votre base de données. Après la création, le fichier de sauvegarde sera sauvegardé dans le dossier de données de votre serveur.', 'dump_list' => 'Fichiers de sauvegarde existants', 'dump_remove' => 'Supprimer fichier de sauvegarde', -'duplicate_content' => '', +'duplicate_content' => 'Contenu en double', 'edit' => 'Modifier', 'edit_attributes' => 'Modifier les attributs', 'edit_comment' => 'Modifier le commentaire', @@ -390,6 +390,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'Modifier un utilisateur', 'edit_user_details' => 'Modifier les détails d\'utilisateur', +'edit_version' => '', 'email' => 'E-mail', 'email_error_title' => 'Aucun e-mail indiqué', 'email_footer' => 'Vous pouvez modifier les paramètres de messagerie via \'Mon compte\'.', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index c31082a6d..fcaea7fe9 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -395,6 +395,7 @@ Internet poveznica: [url]', 'edit_transmittal_props' => 'Izmjena postavki proslijeđivanja', 'edit_user' => 'Uredi korisnika', 'edit_user_details' => 'Uredi detalje korisnika', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => 'Nema ulaznog emaila', 'email_footer' => 'Koristeći funckcije \'Moj račun\' možete promijeniti postavke email obavještavanja.', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index acd1ad5f2..efa2fef1d 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -390,6 +390,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'Felhasználó szerkesztése', 'edit_user_details' => 'Felhasználó részletes adatainak szerkesztése', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => 'Nem adott meg email címet', 'email_footer' => 'Bármikor módosíthatja email beállításait a \'My Account\' funkcióval', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 135ffd23b..6b76c5f7b 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/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 (1524), s.pnt (26) +// Translators: Admin (1525), s.pnt (26) $text = array( 'accept' => 'Accetta', @@ -396,6 +396,7 @@ URL: [url]', 'edit_transmittal_props' => 'Modifica proprietà trasmissione', 'edit_user' => 'Modifica l\'utente', 'edit_user_details' => 'Modifica i dettagli utente', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => 'Nessuna email immessa', 'email_footer' => 'Puoi cambiare l\'impostazione della tua email utilizzando le funzioni del menu \'Account personale\'', @@ -1017,7 +1018,7 @@ URL: [url]', 'settings_dropFolderDir' => 'Cartella per il drop', 'settings_dropFolderDir_desc' => 'Questa cartella viene utilizzata per rilasciare (drop) files sul server per importarli direttamente anziché caricarli attraverso il browser. La cartella deve contenere una sottocartella per ciascun utente autorizzato ad importare files in questo modo.', 'settings_Edition' => 'Impostazioni di edizione', -'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes' => 'Tipi di files modificabili Online', 'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Abilitare per notifiche', 'settings_enableAcknowledgeWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 32219d25e..af625865d 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -395,6 +395,7 @@ URL: [url]', 'edit_transmittal_props' => '전송 속성 편집', 'edit_user' => '사용자 편집', 'edit_user_details' => '사용자 세부 사항 편집', +'edit_version' => '', 'email' => '이메일', 'email_error_title' => '이메일 입력', 'email_footer' => '내 계정\'을 사용하여 전자 메일 설정을 변경 할 수 있습니다', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index cc948f9b6..6b0ab5824 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -388,6 +388,7 @@ URL: [url]', 'edit_transmittal_props' => 'Opmerkingen bij verzending', 'edit_user' => 'Wijzig gebruiker', 'edit_user_details' => 'Wijzig gebruiker Details', +'edit_version' => '', 'email' => 'E-mail', 'email_error_title' => 'Geen email ingevoerd', 'email_footer' => 'U kunt altijd uw e-mail instellingen wijzigen via de \'Mijn Account\' opties', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index e9c47e2d6..71db94f38 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/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 (731), netixw (84), romi (93), uGn (112) +// Translators: Admin (733), netixw (84), romi (93), uGn (112) $text = array( 'accept' => 'Akceptuj', @@ -383,6 +383,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'Edytuj użytkownika', 'edit_user_details' => 'Zmień dane użytkownika', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => 'Nie wprowadzono adresu email', 'email_footer' => 'W każdej chwili możesz zmienić swój email używając zakładki \'Moje konto\'.', @@ -934,8 +935,8 @@ URL: [url]', 'settings_cannot_disable' => 'Plik ENABLE_INSTALL_TOOL nie może zostać usunięty', 'settings_checkOutDir' => '', 'settings_checkOutDir_desc' => '', -'settings_cmdTimeout' => '', -'settings_cmdTimeout_desc' => '', +'settings_cmdTimeout' => 'Przekroczony czas wykonania zewnętrznego polecenia', +'settings_cmdTimeout_desc' => 'Ten czas w sekundach określa kiedy zewnętrzne polecenie (np. do tworzenia indeksu) zostanie przerwany', 'settings_contentDir' => 'Katalog treści', 'settings_contentDir_desc' => 'Miejsce, gdzie będą przechowywane wczytane pliki (najlepien wybrać katalog, który nie jest dostępny dla serwera http)', 'settings_contentOffsetDir' => 'Offset katalogu treści', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 2a8bb7f95..c0ce47019 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -389,6 +389,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'Editar usuário', 'edit_user_details' => 'Editar Perfil', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => 'Nenhum email informado', 'email_footer' => 'You can always change your e-mail settings using \'My Account\' functions', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index f8c4f901e..059903c7e 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -395,6 +395,7 @@ URL: [url]', 'edit_transmittal_props' => 'Editeaza proprietatile de transmitere', 'edit_user' => 'Editează utilizator', 'edit_user_details' => 'Editează detalii utilizator', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => 'Nici un email introdus', 'email_footer' => 'Puteți schimba oricând setările de e-mail folosind functionalitatile din \'Contul meu\'', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 41dfde4c0..bc56096a0 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -395,6 +395,7 @@ URL: [url]', 'edit_transmittal_props' => 'Редактировать группы получателей', 'edit_user' => 'Редактировать пользователя', 'edit_user_details' => 'Изменить данные пользователя', +'edit_version' => '', 'email' => 'E-mail', 'email_error_title' => 'Не указан e-mail', 'email_footer' => 'Вы можете изменить e-mail используя меню «Моя учётка».', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index ee7332cef..49f88fa71 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -342,6 +342,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'Upraviť používateľa', 'edit_user_details' => 'Upraviť podrobnosti používateľa', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => '', 'email_footer' => 'Nastavenia e-mailu si kedykoľvek môžete zmeniť cez \'Môj účet\'', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index ca4b726f2..281aa3692 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -383,6 +383,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'Ändra användare', 'edit_user_details' => 'Ändra användarens information', +'edit_version' => '', 'email' => 'E-post', 'email_error_title' => 'E-post saknas', 'email_footer' => 'Du kan alltid ändra dina e-postinställningar genom att gå till \'Min Sida\'', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 88c545f46..1f7472bb6 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -389,6 +389,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => 'Kullanıcıyı düzenle', 'edit_user_details' => 'Kullanıcı Detaylarını Düzenle', +'edit_version' => '', 'email' => 'E-posta', 'email_error_title' => 'E-posta adresi girilmedi', 'email_footer' => '\'My Account\' özelliklerini kullanarak her zaman e-posta ayarlarınızı değiştirebilirsiniz', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 9dbe57cd0..89abf1b89 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -395,6 +395,7 @@ URL: [url]', 'edit_transmittal_props' => 'Редагувати налаштування перенесення', 'edit_user' => 'Редагувати користувача', 'edit_user_details' => 'Змінити дані користувача', +'edit_version' => '', 'email' => 'E-mail', 'email_error_title' => 'Не вказано e-mail', 'email_footer' => 'Ви можете змінити e-mail використовуючи меню «Мій обліковий запис».', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index f673d569d..858c1fb80 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -344,6 +344,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => '编辑用户', 'edit_user_details' => '编辑用户详情', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => '', 'email_footer' => '您可以用‘我的账户’选项来改变您的e-mail设置', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 42c4e389d..fe7b58284 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -342,6 +342,7 @@ URL: [url]', 'edit_transmittal_props' => '', 'edit_user' => '編輯用戶', 'edit_user_details' => '編輯用戶詳情', +'edit_version' => '', 'email' => 'Email', 'email_error_title' => '', 'email_footer' => '您可以用‘我的帳戶’選項來改變您的e-mail設置', diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php index f7e797ec1..78459d678 100644 --- a/op/op.CheckInDocument.php +++ b/op/op.CheckInDocument.php @@ -87,6 +87,16 @@ else $reviewers["g"][] = $grp; } } + // Retrieve the list of reviewer groups whose members become individual reviewers + if (isset($_POST["grpIndReviewers"])) { + foreach ($_POST["grpIndReviewers"] as $grp) { + if($group = $dms->getGroup($grp)) { + $members = $group->getUsers(); + foreach($members as $member) + $reviewers["i"][] = $member->getID(); + } + } + } } // Retrieve the list of individual approvers from the form. @@ -103,6 +113,16 @@ else $approvers["g"][] = $grp; } } + // Retrieve the list of reviewer groups whose members become individual approvers + if (isset($_POST["grpIndApprovers"])) { + foreach ($_POST["grpIndApprovers"] as $grp) { + if($group = $dms->getGroup($grp)) { + $members = $group->getUsers(); + foreach($members as $member) + $approvers["i"][] = $member->getID(); + } + } + } // add mandatory reviewers/approvers $docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp); diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php index c81e67925..82696db10 100644 --- a/views/bootstrap/class.CheckInDocument.php +++ b/views/bootstrap/class.CheckInDocument.php @@ -31,6 +31,7 @@ class SeedDMS_View_CheckInDocument extends SeedDMS_Bootstrap_Style { $strictformcheck = $this->params['strictformcheck']; $dropfolderdir = $this->params['dropfolderdir']; header('Content-Type: application/javascript; charset=UTF-8'); + $this->printSelectPresetButtonJs(); ?> function checkForm() { @@ -71,25 +72,6 @@ $(document).ready(function() { - "> - -params['dms']; $user = $this->params['user']; @@ -260,7 +242,7 @@ $(document).ready( function() { } } if($tmp) { - $this->__takeOverButton("IndReviewer", $tmp); + $this->printSelectPresetButtonHtml("IndReviewer", $tmp); } /* List all mandatory reviewers */ if($res) { @@ -294,6 +276,20 @@ $(document).ready( function() { ?> +