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

This commit is contained in:
Uwe Steinmann 2018-02-27 18:26:29 +01:00
commit 1928225d02
30 changed files with 175 additions and 40 deletions

View File

@ -5,6 +5,11 @@
- add attribute groups and selective output of attributes
- document versions can be downloaded by a temporary link
--------------------------------------------------------------------------------
Changes in version 6.0.5
--------------------------------------------------------------------------------
- sync form for updating document by upload and checkin
--------------------------------------------------------------------------------
Changes in version 6.0.4
--------------------------------------------------------------------------------

View File

@ -465,6 +465,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'الإسبانية',
'event_details' => 'تفاصيل الحدث',
'exclude_items' => '',
@ -1093,6 +1094,8 @@ URL: [url]',
'settings_Advanced' => 'متقدم',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => '',
'settings_autoLoginUser' => '',

View File

@ -420,6 +420,7 @@ $text = array(
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Испански',
'event_details' => 'Детайли за събитието',
'exclude_items' => '',
@ -958,6 +959,8 @@ $text = array(
'settings_Advanced' => 'Допълнително',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => 'Настройки на автентификацията',
'settings_autoLoginUser' => '',

View File

@ -425,6 +425,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Castellà',
'event_details' => 'Detalls de l\'event',
'exclude_items' => '',
@ -963,6 +964,8 @@ URL: [url]',
'settings_Advanced' => '',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => '',
'settings_autoLoginUser' => '',

View File

@ -472,6 +472,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Španělština',
'event_details' => 'Údaje akce',
'exclude_items' => '',
@ -1102,6 +1103,8 @@ URL: [url]',
'settings_Advanced' => 'Advanced',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => 'Authentication settings',
'settings_autoLoginUser' => '',

View File

@ -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 (2545), dgrutsch (22)
// Translators: Admin (2551), dgrutsch (22)
$text = array(
'2_factor_auth' => '2-Faktor Authentifizierung',
@ -488,6 +488,7 @@ Der Link ist bis zum [valid] gültig.
'error_remove_permission' => 'Fehler beim Entfernen der Berechtigung',
'error_toogle_permission' => 'Fehler beim Ändern der Berechtigung',
'error_transfer_document' => 'Fehler beim Übertragen des Dokuments',
'error_uploading_reviewer_only' => 'Fehler beim Anlegen des Dokuments. Das Dokument besitzt einen Prufer, aber keinen Freigeber.',
'es_ES' => 'Spanisch',
'event_details' => 'Ereignisdetails',
'exclude_items' => 'Einträge auslassen',
@ -621,7 +622,7 @@ URL: [url]',
'inherits_access_empty_msg' => 'Leere Zugriffsliste',
'inherits_access_msg' => 'Zur Zeit werden die Rechte geerbt',
'internal_error' => 'Interner Fehler',
'internal_error_exit' => 'Interner Fehler: nicht imstande, Anfrage auszuführen.',
'internal_error_exit' => 'Interner Fehler: Anfrage kann nicht ausgeführt werden.',
'invalid_access_mode' => 'Unzulässige Zugangsart',
'invalid_action' => 'Unzulässige Aktion',
'invalid_approval_status' => 'Unzulässiger Freigabestatus',
@ -1058,7 +1059,7 @@ URL: [url]',
'rewind_workflow_warning' => 'Wenn Sie einen Workflow in den Anfangszustand zurückversetzen, dann werden alle bisherigen Aktionen und Kommentare unwiederbringlich gelöscht.',
'rm_attrdef' => 'Attributdefinition löschen',
'rm_attrdefgroup' => 'Diese Attributgruppe löschen',
'rm_attr_value' => '',
'rm_attr_value' => 'Wert entfernen',
'rm_default_keyword_category' => 'Kategorie löschen',
'rm_document' => 'Löschen',
'rm_document_category' => 'Lösche Kategorie',
@ -1168,6 +1169,8 @@ Name: [username]
'settings_Advanced' => 'Erweitert',
'settings_advancedAcl' => 'Erweiterte Zugriffsrechte',
'settings_advancedAcl_desc' => 'Erweiterte Zugriffsrechte erlauben bestimmte Module der Software ein- und auszuschalten. Sie können nicht den Zugriff auf Dokumente und Ordner einschränken.',
'settings_allowReviewerOnly' => 'Erlaube nur Prüfer zu setzen',
'settings_allowReviewerOnly_desc' => 'Anwählen, um zu erlauben, dass nur ein Prüfer aber kein Freigeber beim traditionellen Workflow gesetzt werden darf.',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => 'Authentifikations-Einstellungen',
'settings_autoLoginUser' => 'Automatisches Login',

View File

@ -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 (230)
// Translators: Admin (231)
$text = array(
'2_factor_auth' => '',
@ -420,6 +420,7 @@ $text = array(
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Spanish/Ισπανικά',
'event_details' => '',
'exclude_items' => '',
@ -871,7 +872,7 @@ URL: [url]',
'rewind_workflow_warning' => '',
'rm_attrdef' => '',
'rm_attrdefgroup' => '',
'rm_attr_value' => 'Wert entfernen',
'rm_attr_value' => '',
'rm_default_keyword_category' => '',
'rm_document' => 'Διαγραφή εγγράφου',
'rm_document_category' => 'Διαγραφή κατηγορίας',
@ -969,6 +970,8 @@ URL: [url]',
'settings_Advanced' => '',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => '',
'settings_Authentication' => '',
'settings_autoLoginUser' => '',

View File

@ -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 (1668), archonwang (3), dgrutsch (9), netixw (14)
// Translators: Admin (1672), archonwang (3), dgrutsch (9), netixw (14)
$text = array(
'2_factor_auth' => '2-factor authentication',
@ -489,6 +489,7 @@ The link is valid until [valid].
'error_remove_permission' => 'Error while remove permission',
'error_toogle_permission' => 'Error while changing permission',
'error_transfer_document' => 'Error while transfering document',
'error_uploading_reviewer_only' => 'Error when creating the document. The document has a reviewer, but no approver.',
'es_ES' => 'Spanish',
'event_details' => 'Event details',
'exclude_items' => 'Exclude items',
@ -1163,6 +1164,8 @@ Name: [username]
'settings_Advanced' => 'Advanced',
'settings_advancedAcl' => 'Advanced Access control',
'settings_advancedAcl_desc' => 'Advanced access controll will allow to turn on/off certain modules of the software. It can not be used for access rights on documents and folders.',
'settings_allowReviewerOnly' => 'Allow to set reviewer only',
'settings_allowReviewerOnly_desc' => 'Enable this, if it shall be allow to set just a reviewer but no approver in traditional workflow mode.',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => 'Authentication settings',
'settings_autoLoginUser' => 'Automatic login',

View File

@ -472,6 +472,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Castellano',
'event_details' => 'Detalles del evento',
'exclude_items' => 'Registros excluidos',
@ -1108,6 +1109,8 @@ URL: [url]',
'settings_Advanced' => 'Avanzado',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Módulo Reescritura',
'settings_Authentication' => 'Configuración de autenticación',
'settings_autoLoginUser' => 'Acceso automatico',

View File

@ -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 (1079), jeromerobert (50), lonnnew (9), Oudiceval (508)
// Translators: Admin (1079), jeromerobert (50), lonnnew (9), Oudiceval (509)
$text = array(
'2_factor_auth' => 'Authentification forte',
@ -489,6 +489,7 @@ Le lien est valide jusquau [valid].
'error_remove_permission' => 'Erreur lors de la suppression de permission',
'error_toogle_permission' => 'Erreur lors de la modification de permission',
'error_transfer_document' => 'Erreur lors du transfert du document',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Espagnol',
'event_details' => 'Détails de l\'événement',
'exclude_items' => 'Exclure des élements',
@ -1091,7 +1092,7 @@ URL : [url]',
'seconds' => 'secondes',
'selection' => 'Sélection',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_attribute_value' => 'Sélectionnez la valeur de lattribut',
'select_category' => 'Cliquer pour choisir une catégorie',
'select_group' => '',
'select_groups' => 'Cliquer pour choisir un groupe',
@ -1140,6 +1141,8 @@ Nom : [username]
'settings_Advanced' => 'Avancé',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => 'Paramètres d\'authentification',
'settings_autoLoginUser' => 'Connexion automatique',

View File

@ -477,6 +477,7 @@ Internet poveznica: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Španjolski',
'event_details' => 'Detalji događaja',
'exclude_items' => 'Isključivanje stavki',
@ -1129,6 +1130,8 @@ Internet poveznica: [url]',
'settings_Advanced' => 'Napredno',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Modul prepisa',
'settings_Authentication' => 'Postavke autentifikacije',
'settings_autoLoginUser' => 'Automatska prijava',

View File

@ -472,6 +472,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Spanyol',
'event_details' => 'Esemény részletek',
'exclude_items' => 'Kizárt elemek',
@ -1107,6 +1108,8 @@ URL: [url]',
'settings_Advanced' => 'Részletek',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Rewrite modul',
'settings_Authentication' => 'Hitelesítési beállítások',
'settings_autoLoginUser' => '',

View File

@ -478,6 +478,7 @@ URL: [url]',
'error_remove_permission' => 'Errore durante la rimozione delle autorizzazioni',
'error_toogle_permission' => 'Errore durante la modifica permessi',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Spagnolo',
'event_details' => 'Dettagli evento',
'exclude_items' => 'Escludi Elementi',
@ -1141,6 +1142,8 @@ URL: [url]',
'settings_Advanced' => 'Avanzate',
'settings_advancedAcl' => 'Avanzate controlo accesso',
'settings_advancedAcl_desc' => 'Avanzatoa controlo di accesso consente di attivare / diattivare alcuni moduli di software. Non può essere utilizzato per i diritti di accesso su documenti e cartelle.',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Mod Rewrite',
'settings_Authentication' => 'Impostazioni di Autenticazione',
'settings_autoLoginUser' => 'Login automatico',

View File

@ -478,6 +478,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => '스페인어',
'event_details' => '이벤트의 자세한 사항',
'exclude_items' => '항목 제외',
@ -1123,6 +1124,8 @@ URL : [url]',
'settings_Advanced' => '고급',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => '아파치 - 모듈 다시 쓰기',
'settings_Authentication' => '인증 설정',
'settings_autoLoginUser' => '자동 로그인',

View File

@ -477,6 +477,7 @@ De link is geldig tot [valid].
'error_remove_permission' => 'Verwijder permissie',
'error_toogle_permission' => 'Wijzig permissie',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Spaans',
'event_details' => 'Activiteit-details',
'exclude_items' => 'Sluit iets uit',
@ -1149,6 +1150,8 @@ Name: [username]
'settings_Advanced' => 'Uitgebreid',
'settings_advancedAcl' => 'Advanced Access control',
'settings_advancedAcl_desc' => 'Advanced Access control staat het uit- en inschakelen van bepaalde modules toe. Het kan niet gebruikt worden voor het beheer van toegangsrechten van documenten en mappen.',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => 'Authenticatie instellingen',
'settings_autoLoginUser' => 'Automatische login',

View File

@ -465,6 +465,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Hiszpański',
'event_details' => 'Szczegóły zdarzenia',
'exclude_items' => '',
@ -1087,6 +1088,8 @@ URL: [url]',
'settings_Advanced' => 'Zaawansowane',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Moduł Rewrite',
'settings_Authentication' => 'Ustawienia uwierzytelniania',
'settings_autoLoginUser' => 'Automatyczne logowanie',

View File

@ -471,6 +471,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Espanhol',
'event_details' => 'Event details',
'exclude_items' => 'Excluir ítens',
@ -1105,6 +1106,8 @@ URL: [url]',
'settings_Advanced' => 'Avançado',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Módulo Rewrite',
'settings_Authentication' => 'Definições de autenticação',
'settings_autoLoginUser' => 'Login automático',

View File

@ -477,6 +477,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Spaniola',
'event_details' => 'Detalii eveniment',
'exclude_items' => 'Elemente excluse',
@ -1130,6 +1131,8 @@ URL: [url]',
'settings_Advanced' => 'Avansat',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => 'Setări de autentificare',
'settings_autoLoginUser' => 'Login automat',

View File

@ -477,6 +477,7 @@ URL: [url]',
'error_remove_permission' => 'Ошибка снятия разрешения',
'error_toogle_permission' => 'Ошибка смены разрешения',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Spanish',
'event_details' => 'Информация о событии',
'exclude_items' => 'Не показывать события:',
@ -1137,6 +1138,8 @@ URL: [url]',
'settings_Advanced' => 'Дополнительно',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache — модуль Rewrite',
'settings_Authentication' => 'Настройки авторизации',
'settings_autoLoginUser' => 'Автоматический вход',

View File

@ -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 (564), destinqo (19), pS2017 (508)
// Translators: Admin (565), destinqo (19), pS2017 (508)
$text = array(
'2_factor_auth' => '2-faktorové overovanie',
@ -424,6 +424,7 @@ URL: [url]',
'error_remove_permission' => 'Chyba pri odstránení povolenia',
'error_toogle_permission' => 'Chyba pri zmene povolenia',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Španielčina',
'event_details' => 'Detail udalosti',
'exclude_items' => 'Vylúčiť položky',
@ -962,6 +963,8 @@ URL: [url]',
'settings_Advanced' => 'Rozšírené',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Modul Rewrite',
'settings_Authentication' => '',
'settings_autoLoginUser' => 'Automatické prihlásenie',
@ -1544,7 +1547,7 @@ URL: [url]',
'workflow_summary' => '',
'workflow_transition_without_user_group' => '',
'workflow_user_summary' => '',
'x_more_objects' => '',
'x_more_objects' => 'viac objektov',
'year_view' => 'Rok',
'yes' => 'Áno',
'zh_CN' => 'Čínština (CN)',

View File

@ -490,6 +490,7 @@ Länken är giltig t o m [valid].
'error_remove_permission' => 'Fel vid borttagen behörighet',
'error_toogle_permission' => 'Fel vid förändring av behörighet',
'error_transfer_document' => 'Fel vid förflyttning av dokument',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Spanska',
'event_details' => 'Händelseinställningar',
'exclude_items' => '',
@ -1150,6 +1151,8 @@ Kommentar: [comment]',
'settings_Advanced' => 'Avancerat',
'settings_advancedAcl' => 'Avancerad åtkomstkontroll',
'settings_advancedAcl_desc' => 'Avancerad åtkomskontroll används för att aktivera/avaktivera särskilda moduler i mjukvaran. Du kan inte använda denna funktion för att ange åtkomst till dokument eller kataloger.',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => 'Inställningar för autentisering',
'settings_autoLoginUser' => 'Automatisk inloggning',

View File

@ -471,6 +471,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'İspanyolca',
'event_details' => 'Etkinkil detayları',
'exclude_items' => '',
@ -1109,6 +1110,8 @@ URL: [url]',
'settings_Advanced' => 'Gelişmiş ayarlar',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
'settings_Authentication' => 'Yetkilendirme ayarları',
'settings_autoLoginUser' => '',

View File

@ -477,6 +477,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => 'Spanish',
'event_details' => 'Інформація про подію',
'exclude_items' => 'Виключені елементи',
@ -1130,6 +1131,8 @@ URL: [url]',
'settings_Advanced' => 'Додатково',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => 'Apache — модуль Rewrite',
'settings_Authentication' => 'Налаштування авторизації',
'settings_autoLoginUser' => 'Автоматичний вхід',

View File

@ -479,6 +479,7 @@ URL: [url]',
'error_remove_permission' => '移除权限时报错',
'error_toogle_permission' => '修改权限时报错',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => '西班牙语',
'event_details' => '错误详情',
'exclude_items' => '排除项目',
@ -1113,6 +1114,8 @@ URL: [url]',
'settings_Advanced' => '高级设置',
'settings_advancedAcl' => '高级访问控制',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => '',
'settings_Authentication' => '授权管理',
'settings_autoLoginUser' => '自动登陆',

View File

@ -424,6 +424,7 @@ URL: [url]',
'error_remove_permission' => '',
'error_toogle_permission' => '',
'error_transfer_document' => '',
'error_uploading_reviewer_only' => '',
'es_ES' => '西班牙語',
'event_details' => '錯誤詳情',
'exclude_items' => '例外項目',
@ -962,6 +963,8 @@ URL: [url]',
'settings_Advanced' => '',
'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '',
'settings_allowReviewerOnly_desc' => '',
'settings_apache_mod_rewrite' => '',
'settings_Authentication' => '',
'settings_autoLoginUser' => '',

View File

@ -197,7 +197,7 @@ else
$members = $group->getUsers();
foreach($members as $member) {
/* Do not add the uploader itself and approvers */
if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
$recipients["i"][] = $member->getID();
}
}
@ -362,17 +362,35 @@ else
}
}
$expires = false;
if (!isset($_POST['expires']) || $_POST["expires"] != "false") {
if($_POST["expdate"]) {
$tmp = explode('-', $_POST["expdate"]);
$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
} else {
$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
}
$oldexpires = $document->getExpires();
switch($_POST["presetexpdate"]) {
case "date":
$tmp = explode('-', $_POST["expdate"]);
$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
break;
case "1w":
$tmp = explode('-', date('Y-m-d'));
$expires = mktime(0,0,0, $tmp[1], $tmp[2]+7, $tmp[0]);
break;
case "1m":
$tmp = explode('-', date('Y-m-d'));
$expires = mktime(0,0,0, $tmp[1]+1, $tmp[2], $tmp[0]);
break;
case "1y":
$tmp = explode('-', date('Y-m-d'));
$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+1);
break;
case "2y":
$tmp = explode('-', date('Y-m-d'));
$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2);
break;
case "never":
default:
$expires = null;
break;
}
if ($expires) {
if($oldexpires != $expires) {
if($document->setExpires($expires)) {
if($notifier) {
$notifyList = $document->getNotifyList();

View File

@ -309,7 +309,7 @@ default:
$members = $group->getUsers();
foreach($members as $member) {
/* Do not add the uploader itself and approvers */
if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
$recipients["i"][] = $member->getID();
}
}

View File

@ -72,7 +72,7 @@ if($view) {
$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
$view->setParam('enableselfrec', $settings->_enableSelfReceipt);
$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
$view->setParam('dropfolderdir', $settings->_dropFolderDir);
$view->setParam('workflowmode', $settings->_workflowMode);
$view->setParam('presetexpiration', $settings->_presetExpirationDate);

View File

@ -29,18 +29,14 @@ class SeedDMS_View_CheckInDocument extends SeedDMS_Bootstrap_Style {
function js() { /* {{{ */
$strictformcheck = $this->params['strictformcheck'];
$dropfolderdir = $this->params['dropfolderdir'];
header('Content-Type: application/javascript; charset=UTF-8');
$this->printSelectPresetButtonJs();
$this->printInputPresetButtonJs();
$this->printCheckboxPresetButtonJs();
?>
function checkForm()
{
msg = new Array();
<?php if($dropfolderdir) { ?>
if (document.form1.userfile.value == "" && document.form1.dropfolderfileform1.value == "") msg.push("<?php printMLText("js_no_file");?>");
<?php } else { ?>
if (document.form1.userfile.value == "") msg.push("<?php printMLText("js_no_file");?>");
<?php } ?>
<?php
if ($strictformcheck) {
?>
@ -68,6 +64,12 @@ $(document).ready(function() {
if(checkForm()) return;
event.preventDefault();
});
$('#presetexpdate').on('change', function(ev){
if($(this).val() == 'date')
$('#control_expdate').show();
else
$('#control_expdate').hide();
});
});
<?php
} /* }}} */
@ -83,7 +85,6 @@ $(document).ready(function() {
$enableownerrevapp = $this->params['enableownerrevapp'];
$enableselfrevapp = $this->params['enableselfrevapp'];
$enableselfreceipt = $this->params['enableselfreceipt'];
$dropfolderdir = $this->params['dropfolderdir'];
$workflowmode = $this->params['workflowmode'];
$presetexpiration = $this->params['presetexpiration'];
$documentid = $document->getId();
@ -162,39 +163,75 @@ $(document).ready(function() {
<tr>
<td><?php printMLText("comment");?>:</td>
<td class="standardText">
<textarea name="comment" rows="4" cols="80"></textarea>
<textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>></textarea>
</td>
</tr>
<?php
if($presetexpiration) {
if(!($expts = strtotime($presetexpiration)))
$expts = time();
$expts = false;
} else {
$expts = time();
$expts = false;
}
?>
<tr>
<td><?php printMLText("preset_expires");?>:</td>
<td>
<select class="span6" name="presetexpdate" id="presetexpdate">
<option value="never"><?php printMLText('does_not_expire');?></option>
<option value="date"<?php echo ($expts != '' ? " selected" : ""); ?>><?php printMLText('expire_by_date');?></option>
<option value="1w"><?php printMLText('expire_in_1w');?></option>
<option value="1m"><?php printMLText('expire_in_1m');?></option>
<option value="1y"><?php printMLText('expire_in_1y');?></option>
<option value="2y"><?php printMLText('expire_in_2y');?></option>
</select>
</td>
</tr>
<tr id="control_expdate" <?php echo ($expts == false ? 'style="display: none;"' : ''); ?>>
<td><?php printMLText("expires");?>:</td>
<td class="standardText">
<span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y', $expts); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
<input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y', $expts); ?>">
<span class="input-append date span12" id="expirationdate" data-date="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
<input class="span3" size="16" name="expdate" type="text" value="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>">
<span class="add-on"><i class="icon-calendar"></i></span>
</span><br />
<label class="checkbox inline">
<input type="checkbox" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
</label>
</span>
</td>
</tr>
<?php
$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
if($attrdefs) {
foreach($attrdefs as $attrdef) {
$arr = $this->callHook('editDocumentContentAttribute', $document, $attrdef);
if(is_array($arr)) {
if($arr) {
echo "<tr>";
echo "<td>".$arr[0].":</td>";
echo "<td>".$arr[1]."</td>";
echo "</tr>";
}
} else {
?>
<tr>
<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
<td><?php $this->printAttributeEditField($attrdef, '') ?></td>
<td><?php $this->printAttributeEditField($attrdef, '', 'attributes_version') ?>
<?php
if($latestContent->getAttributeValue($attrdef)) {
switch($attrdef->getType()) {
case SeedDMS_Core_AttributeDefinition::type_string:
case SeedDMS_Core_AttributeDefinition::type_date:
case SeedDMS_Core_AttributeDefinition::type_int:
case SeedDMS_Core_AttributeDefinition::type_float:
$this->printInputPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
break;
case SeedDMS_Core_AttributeDefinition::type_boolean:
$this->printCheckboxPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
break;
}
// print_r($latestContent->getAttributeValue($attrdef));
}
?></td>
</tr>
<?php
}
}
}
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {

View File

@ -1546,7 +1546,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$items = $this->callHook('extraVersionActions', $version);
if($items) {
foreach($items as $item) {
echo "<li>".$item."</li>";
if(is_string($item))
echo "<li>".$item."</li>";
elseif(is_array($item))
echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"icon-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
}
}
print "</ul>";