Merge branch 'develop' into seeddms-5.1.x

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' => 'يمكنك دائما تغيير اعدادات بريدك الالكتروني من خلال خاصية - مستنداتي',

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 исползвайки функцията \'Моя учетка\'',

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»',

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' => '',

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.',

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',

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',

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\'.',

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.',

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',

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.',

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' => '내 계정\'을 사용하여 전자 메일 설정을 변경 할 수 있습니다',

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',

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' => 'Przekroczony czas wykonania zewnętrznego polecenia',
-'settings_cmdTimeout_desc' => '',
+'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',

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',

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\'',

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 используя меню «Моя учётка».',

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\'',

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\'',

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',

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 використовуючи меню «Мій обліковий запис».',

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设置',

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設置',

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);

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() {
 <?php
 	} /* }}} */
 
-	function __takeOverButton($name, $users) { /* {{{ */
-?>
-	<span id="<?php echo $name; ?>_btn" style="cursor: pointer;" title="<?php printMLText("takeOver".$name); ?>"><i class="icon-arrow-left"></i></span>
-<script>
-$(document).ready( function() {
-	$('#<?php echo $name; ?>_btn').click(function(ev){
-		ev.preventDefault();
-<?php
-		foreach($users as $_id) {
-			echo "$(\"#".$name." option[value='".$_id."']\").attr(\"selected\", \"selected\");\n";
-		}
-?>
-		$("#<?php echo $name; ?>").trigger("chosen:updated");
-	});
-});
-</script>
-<?php
-	} /* }}} */
-
 	function show() { /* {{{ */
 		$dms = $this->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() {
 ?>
       </td>
     </tr>
+      <tr>
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+        <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_reviewers'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+			</td>
+			</tr>
     <tr>
       <td>
 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
@@ -329,7 +325,7 @@ $(document).ready( function() {
 					}
 				}
 				if($tmp) {
-					$this->__takeOverButton("GrpReviewer", $tmp);
+					$this->printSelectPresetButtonHtml("GrpReviewer", $tmp);
 				}
 				/* List all mandatory groups of reviewers */
 				if($res) {
@@ -407,7 +403,7 @@ $(document).ready( function() {
 					}
 				}
 				if($tmp) {
-					$this->__takeOverButton("IndApprover", $tmp);
+					$this->printSelectPresetButtonHtml("IndApprover", $tmp);
 				}
 				/* List all mandatory approvers */
 				if($res) {
@@ -441,7 +437,22 @@ $(document).ready( function() {
 				}
 ?>
       </td>
-    </tr>
+		</tr>
+		  <tr>	
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+      <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_approvers'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+				</td>
+			</tr>	
+		<tr>
       <td>
 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
       </td>
@@ -477,7 +488,7 @@ $(document).ready( function() {
 					}
 				}
 				if($tmp) {
-					$this->__takeOverButton("GrpApprover", $tmp);
+					$this->printSelectPresetButtonHtml("GrpApprover", $tmp);
 				}
 				/* List all mandatory groups of approvers */
 				if($res) {