diff --git a/CHANGELOG b/CHANGELOG index 8a7992aa6..841009a1d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -81,6 +81,7 @@ - add new method getDocumentPreview() to restapi - replace lots of tables in forms by bootstraps control-group - add remove button to folder selector +- editing of an exiting review/approval can be turned off -------------------------------------------------------------------------------- Changes in version 4.3.31 diff --git a/Makefile b/Makefile index ee8e2fe92..39ac4c2b3 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ VERSION=5.0.9 -SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles TODO LICENSE Makefile webdav install restapi pdfviewer +SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer # webapp -NODISTFILES=Makefile utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean +NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean EXTENSIONS := \ dynamic_content.tar.gz\ @@ -14,7 +14,8 @@ PHPDOC=~/Downloads/phpDocumentor-2.8.1/bin/phpdoc dist: mkdir -p tmp/seeddms-$(VERSION) cp -a $(SRC) tmp/seeddms-$(VERSION) - (cd tmp; rm -rf $(NODISTFILES); tar --exclude=.svn --exclude=.gitignore --exclude=views/blue --exclude=views/hc --exclude=views/clean --exclude=styles/blue --exclude=styles/hc --exclude=styles/clean -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION)) + (cd tmp/seeddms-$(VERSION); rm -rf $(NODISTFILES)) + (cd tmp; tar --exclude=.svn --exclude=.gitignore --exclude=views/blue --exclude=views/hc --exclude=views/clean --exclude=styles/blue --exclude=styles/hc --exclude=styles/clean -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION)) rm -rf tmp pear: diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 19ee7a067..c344ab1a0 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -289,13 +289,29 @@ class SeedDMS_Core_DMS { * * @param array $links list of objects of type SeedDMS_Core_DocumentLink * @param object $user user for which access is being checked + * @param string $access set if source or target of link shall be checked + * for sufficient access rights. Set to 'source' if the source document + * of a link is to be checked, set to 'target' for the target document. + * If not set, then access right aren't checked at all. * @return array filtered list of links */ - static function filterDocumentLinks($user, $links) { /* {{{ */ + static function filterDocumentLinks($user, $links, $access='') { /* {{{ */ $tmp = array(); - foreach ($links as $link) - if ($link->isPublic() || ($link->getUser()->getID() == $user->getID()) || $user->isAdmin()) - array_push($tmp, $link); + foreach ($links as $link) { + if ($link->isPublic() || ($link->getUser()->getID() == $user->getID()) || $user->isAdmin()){ + if($access == 'source') { + $obj = $link->getDocument(); + if ($obj->getAccessMode($user) >= M_READ) + array_push($tmp, $link); + } elseif($access == 'target') { + $obj = $link->getTarget(); + if ($obj->getAccessMode($user) >= M_READ) + array_push($tmp, $link); + } else { + array_push($tmp, $link); + } + } + } return $tmp; } /* }}} */ diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 5234bcc2e..72c554955 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -1142,7 +1142,8 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated GPL License - - order groups by name returned by getReadAccessList() +- order groups by name returned by getReadAccessList() +- add optional parameter to SeedDMS_Core_DMS::filterDocumentLinks() diff --git a/doc/preview.png b/doc/preview.png deleted file mode 100644 index 47676ee22..000000000 Binary files a/doc/preview.png and /dev/null differ diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index 673bd4a43..1a7afeb65 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -235,6 +235,21 @@ class SeedDMS_AccessOperation { return false; } /* }}} */ + /** + * Check if a review maybe edited + * + * A review may only be updated by the user who originaly addedd the + * review and if it is allowed in the settings + */ + function mayUpdateReview($updateUser) { /* {{{ */ + if(get_class($this->obj) == 'SeedDMS_Core_Document') { + if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && !$this->obj->hasExpired()) { + return true; + } + } + return false; + } /* }}} */ + /** * Check if document content may be approved * @@ -253,5 +268,20 @@ class SeedDMS_AccessOperation { } return false; } /* }}} */ + + /** + * Check if a approval maybe edited + * + * An approval may only be updated by the user who originaly addedd the + * approval and if it is allowed in the settings + */ + function mayUpdateApproval($updateUser) { /* {{{ */ + if(get_class($this->obj) == 'SeedDMS_Core_Document') { + if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && !$this->obj->hasExpired()) { + return true; + } + } + return false; + } /* }}} */ } ?> diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 6816ee6eb..73edcf239 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -131,6 +131,8 @@ class Settings { /* {{{ */ var $_enableOwnerRevApp = false; // enable/disable listing logged in user as reviewer/approver var $_enableSelfRevApp = false; + // enable/disable update of a review/approval by the reviewer/approver + var $_enableUpdateRevApp = false; // enable/disable default notification for owner var $_enableOwnerNotification = false; // enable/disable deleting of versions for regular users @@ -561,6 +563,7 @@ class Settings { /* {{{ */ $this->_enableAdminRevApp = Settings::boolval($tab["enableAdminRevApp"]); $this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]); $this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]); + $this->_enableUpdateRevApp = Settings::boolval($tab["enableUpdateRevApp"]); $this->_presetExpirationDate = strval($tab["presetExpirationDate"]); $this->_versioningFileName = strval($tab["versioningFileName"]); $this->_workflowMode = strval($tab["workflowMode"]); @@ -850,6 +853,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "enableAdminRevApp", $this->_enableAdminRevApp); $this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp); $this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp); + $this->setXMLAttributValue($node, "enableUpdateRevApp", $this->_enableUpdateRevApp); $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate); $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName); $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate); diff --git a/drop-tables-innodb.sql b/install/drop-tables-innodb.sql similarity index 100% rename from drop-tables-innodb.sql rename to install/drop-tables-innodb.sql diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 92aebeac8..64a47d232 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -614,6 +614,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'اذا كنت تود تحميل ملفات اكبر من حجم الملفات المتاحة حاليا, من فضلك استخدم البديل صفحة التحميل.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'ملف محلي', @@ -1108,6 +1109,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', 'settings_enableUserImage_desc' => '', 'settings_enableUsersView' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index d0acad6fd..261d2eeaf 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -545,6 +545,7 @@ $text = array( 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Ако искате да качите файлове над текущия лимит, използвайте друг начин.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Локален файл', @@ -973,6 +974,8 @@ $text = array( 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Включи аватари', 'settings_enableUserImage_desc' => 'Включи аватари на потребителите', 'settings_enableUsersView' => 'Включи преглед на потребителите', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 3007016c3..629dd098b 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -550,6 +550,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Arxiu local', @@ -978,6 +979,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', 'settings_enableUserImage_desc' => '', 'settings_enableUsersView' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index bc5be4f32..612030eeb 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -621,6 +621,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Hodláte-li nahrát soubory větší než je maximální velikost pro nahrávání, použijte prosím alternativní stránku.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Lokální soubor', @@ -1117,6 +1118,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Povolte, pokud chcete aktuálně přihlášeného uvést jako posuzovatele/schvalovatele a pro přechody pracovního postupu', 'settings_enableThemeSelector' => 'Volba tématu', 'settings_enableThemeSelector_desc' => 'Volba témat na přihlašovací stránce.', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', 'settings_enableUserImage_desc' => '', 'settings_enableUsersView' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index c1bb25218..a6a3913e3 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 (2350), dgrutsch (22) +// Translators: Admin (2354), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -626,6 +626,7 @@ URL: [url]', 'linked_to_document' => 'Mit dem Dokument verknüpft', 'linked_to_this_version' => 'Mit dieser Version verknüpft', 'link_alt_updatedocument' => 'Wenn Sie ein Dokument hochladen möchten, das größer als die maximale Dateigröße ist, dann benutzen Sie bitte die alternative Upload-Seite.', +'list_access_rights' => 'Alle Zugriffsrechte auflisten ...', 'list_contains_no_access_docs' => 'Die Liste enthält weitere Dokumente auf die Sie keinen Zugriff haben und deshalb nicht angezeigt werden.', 'list_hooks' => 'Liste interne Aufrufe', 'local_file' => 'Lokale Datei', @@ -1160,6 +1161,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Anwählen, um den aktuell angemeldeten Benutzer in der Liste der Prüfer/Freigeber und für Workflow-Aktionen auswählbar zu machen.', 'settings_enableThemeSelector' => 'Auswahl des Themas', 'settings_enableThemeSelector_desc' => 'Schaltet das Auswahlmenü für die Themenauswahl in der Anmeldemaske ein oder aus.', +'settings_enableUpdateRevApp' => 'Erlaube die Änderung einer Prüfung/Freigabe', +'settings_enableUpdateRevApp_desc' => 'Anwählen, um dem Benutzer, der die Prüfung/Freigabe durchgeführt hat, die Änderung der Entscheidung zu erlauben, solange das Dokument den Workflow-Schritt noch nicht verlassen hat.', 'settings_enableUserImage' => 'Benutzerbilder einschalten', 'settings_enableUserImage_desc' => 'Foto der Benutzer ein-/ausschalten', 'settings_enableUsersView' => 'Benutzeransicht aktivieren', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 27e09e4ca..98963d39f 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -545,6 +545,7 @@ $text = array( 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => '', @@ -984,6 +985,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', 'settings_enableUserImage_desc' => '', 'settings_enableUsersView' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index ed7d35efd..b7f0786ba 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 (1480), dgrutsch (9), netixw (14) +// Translators: Admin (1483), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -626,6 +626,7 @@ URL: [url]', 'linked_to_document' => 'Linked to document', 'linked_to_this_version' => 'Linked to this version', 'link_alt_updatedocument' => 'If you would like to upload files bigger than the current maximum upload size, please use the alternative upload page.', +'list_access_rights' => 'List all access rights ...', 'list_contains_no_access_docs' => 'The list contains more documents you have no access to and are not displayed.', 'list_hooks' => 'List hooks', 'local_file' => 'Local file', @@ -1161,6 +1162,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.', 'settings_enableThemeSelector' => 'Theme selection', 'settings_enableThemeSelector_desc' => 'Turns on/off the theme selector on the login page.', +'settings_enableUpdateRevApp' => 'Allow editing of exting review/approval', +'settings_enableUpdateRevApp_desc' => 'Enable this, if the user who has made a review/approval may change the decission as long as the current workflow step has not been finished.', 'settings_enableUserImage' => 'Enable User Image', 'settings_enableUserImage_desc' => 'Enable users images', 'settings_enableUsersView' => 'Enable Users View', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index e1fd66675..7bc745e3f 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -621,6 +621,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Si desea subir archivos mayores que el tamaño máximo actualmente permitido, por favor, utilice la página de subida alternativa.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Fichero local', @@ -1123,6 +1124,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Habilitar esto si quiere que el usuario identificado sea listado como revisor/aprobador y para las transiciones del flujo de trabajo.', 'settings_enableThemeSelector' => 'Selección de temas (skins)', 'settings_enableThemeSelector_desc' => 'Habilitar/deshabilitar la selección de temas en la página de login', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Habilitar imágenes de usuario', 'settings_enableUserImage_desc' => 'Habilitar imágenes de usuario', 'settings_enableUsersView' => 'Habilitar vista de usuarios', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index b2a898510..b11e55fe5 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -626,6 +626,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Pour déposer des fichiers de taille supérieure, utilisez la page d\'ajout multiple.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Fichier local', @@ -1105,6 +1106,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'A autoriser pour avoir l\'utilisateur actuel désigné correcteur/approbateur et pour les transitions de workflow.', 'settings_enableThemeSelector' => 'Sélection du thème', 'settings_enableThemeSelector_desc' => 'Activer/désactiver le sélecteur de thème sur la page de connexion.', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Activer image utilisateurs', 'settings_enableUserImage_desc' => 'Activer les images utilisateurs', 'settings_enableUsersView' => 'Activer Vue des Utilisateurs', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 6cd2565a7..58fea7203 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -626,6 +626,7 @@ Internet poveznica: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Ako želite prenijeti datoteke veće od trenutne maksimalne veličine prijenosa, molimo koristite alternativu upload page.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Lokalna datoteka', @@ -1144,6 +1145,8 @@ Internet poveznica: [url]', 'settings_enableSelfRevApp_desc' => 'Omogući ovo ako želite da trenutno prijavljeni korisnik bude naveden kao recezent/validator i za promjenu toka rada.', 'settings_enableThemeSelector' => 'Odabir teme', 'settings_enableThemeSelector_desc' => 'Uključuje/isključuje izbornik tema na stranici prijave.', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Omogući sliku korisnika', 'settings_enableUserImage_desc' => 'Omogući slike korisnika', 'settings_enableUsersView' => 'Omogući pregled korisnika', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 680279a1d..754786976 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -621,6 +621,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Ha a jelenlegi maximális feltöltési méretnél nagyobb állományokat szeretne feltölteni, akkor használja az alternatív feltöltő oldalt.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Helyi állomány', @@ -1122,6 +1123,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Engedélyezze, a azt szeretné, hogy a bejelentkezett felhasználó listázásra kerüljön felülvizsgálóként/jóváhagyóként és a munkamenet átmeneteknél.', 'settings_enableThemeSelector' => 'Téma választása', 'settings_enableThemeSelector_desc' => 'Kapcsolja be/ki a témaválasztót a bejelentkező oldalon', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Felhasználói kép engedélyezése', 'settings_enableUserImage_desc' => 'Engedélyezi a felhasználók képeit', 'settings_enableUsersView' => 'Felhasználók nézetének engedélyezése', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index dafa15fd1..9b9917213 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -627,6 +627,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la pagina alternativa di upload.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => 'Lista ganci', 'local_file' => 'File locale', @@ -1156,6 +1157,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Abilitare se si desidera aggiungere l\'utente attualmente registrato alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.', 'settings_enableThemeSelector' => 'Selezione tema grafico', 'settings_enableThemeSelector_desc' => 'Abilita/disabilita il selettore di tema grafico nella finestra di login', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Abilita immagine utente', 'settings_enableUserImage_desc' => 'L\'opzione permette di attribuire un\'immagine a ciascun utente', 'settings_enableUsersView' => 'Abilita visualizzazione utenti', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 3651fefa2..c7ce477ca 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -626,6 +626,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '최대 업로드 크기보다 큰 파일을 업로드하려는 경우, 대체 업로드 페이지를 upload page 사용하십시오.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => '로컬 파일', @@ -1137,6 +1138,8 @@ URL : [url]', 'settings_enableSelfRevApp_desc' => '검토 / 승인자로 워크 플로우 전환을 위해 나열되어있는 것이 현재 로그인 한 사용자가 필요한 경우이를 활성화합니다.', 'settings_enableThemeSelector' => '테마 선택', 'settings_enableThemeSelector_desc' => '로그인 페이지의 테마 선택기를 켜기/끄기로 전환합니다.', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '사용자 이미지 사용', 'settings_enableUserImage_desc' => '사용자 이미지 사용', 'settings_enableUsersView' => '사용자보기 사용', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 3b9de41a9..56c976f2f 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -619,6 +619,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Als u bestanden wilt uploaden groter dan het huidige maximum, gebruik aub de alternatieve upload pagina.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Lokaal bestand', @@ -1150,6 +1151,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Schakel in indien the huidig ingelogde gebruiker wordt toegewezen als goedkeurder/ beoordelaar en voor workflow overgangen.', 'settings_enableThemeSelector' => 'Selecteer thema', 'settings_enableThemeSelector_desc' => 'Schakel thema selectie op de aanmeldpagina uit', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Inschakelen Gebruikersplaatjes', 'settings_enableUserImage_desc' => 'Inschakelen Gebruikerplaatjes', 'settings_enableUsersView' => 'Inschakelen Gebruikers overzicht', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 268769156..dbef7e2e2 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -614,6 +614,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Jeśli chcesz wczytać pliki większe niż bieżące maksimum, użyj alternatywnej strony wczytywania.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Lokalny plik', @@ -1102,6 +1103,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Włącz tę opcję jeżeli zalogowany użytkownik ma prawo do recenzowania/zatwierdzania oraz do przepływu procesu', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Włącz obrazy użytkowników', 'settings_enableUserImage_desc' => 'Zezwól na indywidualne obrazki użytkowników', 'settings_enableUsersView' => 'Włącz podgląd użytkownika', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 41347177d..c958b37a0 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -620,6 +620,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Se você gostaria de fazer envio de arquivos maiores que o tamanho permitido, por favor use a página alternativa de envio.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Arquivo local', @@ -1120,6 +1121,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Habilite esta opção se quiser que o usuário conectado no momento seja listado como revisores/aprovadores e para transições de fluxo de trabalho.', 'settings_enableThemeSelector' => 'Seleção de tema', 'settings_enableThemeSelector_desc' => 'Liga/desliga o seletor de tema na página de login.', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Ativar Imagem de Usuário', 'settings_enableUserImage_desc' => 'Ativar Imagens de Usuários', 'settings_enableUsersView' => 'Ativar Usuários Visualizar', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 100391478..c9bf6dd75 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -626,6 +626,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Dacă doriți să încărcați fișiere mai mari decât dimensiunea maximă curentă de încărcare, vă rugăm să folosiți alternativa pagină de încărcare.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Fișier local', @@ -1145,6 +1146,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Activați această opțiune dacă doriți ca utilizatorul autentificat să fie listat ca revizuitor/aprobator sau in tranzițiile workflow-ului.', 'settings_enableThemeSelector' => 'Selecție Temă', 'settings_enableThemeSelector_desc' => 'Activare/dezactivare selector temă pe pagina de login.', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Activați Imaginea utilizatorului', 'settings_enableUserImage_desc' => 'Activați Imagini utilizatori', 'settings_enableUsersView' => 'Activați Vizualizarea utilizatorilor', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index f60f38500..124f06da3 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -626,6 +626,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Для загрузки файлов, превышающих ограничение размера, используйте другой способ.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => 'Список хуков', 'local_file' => 'Локальный файл', @@ -1152,6 +1153,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Включите для того, чтобы пользователи, в настоящее время выполнившие вход в систему, были в списке рецензентов/утверждающих и в изменении процесса.', 'settings_enableThemeSelector' => 'Выбор темы', 'settings_enableThemeSelector_desc' => 'Включить или отключить возможность выбора темы на странице входа.', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Включить аватары', 'settings_enableUserImage_desc' => 'Включить аватары пользователей.', 'settings_enableUsersView' => 'Включить просмотр пользователей', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index a109c73a0..a3e1f9bcb 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -549,6 +549,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Lokálny súbor', @@ -977,6 +978,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', 'settings_enableUserImage_desc' => '', 'settings_enableUsersView' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 9f0a1c31e..7cd8cc833 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -614,6 +614,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Om du vill ladda upp filer som är större än den aktuella största tillåtna storleken, använd dig av den alternativa metoden att ladda upp filer Alternativ uppladdning.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Lokal fil', @@ -1108,6 +1109,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Aktivera om du vill att aktuell inloggad användare visas i listan för personer som granskar/godkänner dokument och i övergång på arbetsflöden.', 'settings_enableThemeSelector' => 'Tema urval', 'settings_enableThemeSelector_desc' => 'Stäng på/av tema urval vid inloggningssidan.', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Aktivera användarbilder', 'settings_enableUserImage_desc' => 'Aktivera användarbilder', 'settings_enableUsersView' => 'Aktivera visning av användare', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index eb30954c4..f6f72e91c 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -620,6 +620,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Mevcut maksimum yükleme boyutundan daha büyük dosya yüklemek istiyorsanız alternatif yükleme sayfası için tıklayın.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Yerel dosya', @@ -1124,6 +1125,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'O an giriş yapmış olan kullanıcıları kontrol eden/onaylayan olarak listelemek ve iş akışına dahil etmek için bunu seçebilirsiniz.', 'settings_enableThemeSelector' => 'Tema seçimini aç/kapat', 'settings_enableThemeSelector_desc' => 'Giriş sayfasında tema seçimini aç/kapat', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Kullanıcı Resmine İzin Ver', 'settings_enableUserImage_desc' => 'Kullanıcı resimlerine izin ver', 'settings_enableUsersView' => 'Kullanıcı Görüntülemeyi Etkinleştir', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index b16e496d5..4515556be 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -626,6 +626,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => 'Для завантаження файлів, які перевищують обмеження розміру, використовуйте інший метод.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => 'Локальний файл', @@ -1145,6 +1146,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => 'Увімкніть для того, щоб користувачі, в даний момент авторизовані у системі, були в списку рецензентів/затверджувачів і в зміні процесу.', 'settings_enableThemeSelector' => 'Вибір теми', 'settings_enableThemeSelector_desc' => 'Увімкнути/вимкнути можливість вибору теми на сторінці авторизації.', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => 'Увімкнути аватари', 'settings_enableUserImage_desc' => 'Увімкнути аватари користувачів.', 'settings_enableUsersView' => 'Увімкнути перегляд користувачів', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index dc080c4f0..7562e1619 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -551,6 +551,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '超过20M大文件，请选择上传大文件.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => '本地文件', @@ -979,6 +980,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', 'settings_enableUserImage_desc' => '', 'settings_enableUsersView' => '开启用户视图', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index fe1bc1c81..cb8546d07 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -549,6 +549,7 @@ URL: [url]', 'linked_to_document' => '', 'linked_to_this_version' => '', 'link_alt_updatedocument' => '超過20M大檔，請選擇上傳大檔.', +'list_access_rights' => '', 'list_contains_no_access_docs' => '', 'list_hooks' => '', 'local_file' => '本地檔', @@ -977,6 +978,8 @@ URL: [url]', 'settings_enableSelfRevApp_desc' => '', 'settings_enableThemeSelector' => '', 'settings_enableThemeSelector_desc' => '', +'settings_enableUpdateRevApp' => '', +'settings_enableUpdateRevApp_desc' => '', 'settings_enableUserImage' => '', 'settings_enableUserImage_desc' => '', 'settings_enableUsersView' => '', diff --git a/op/op.Settings.php b/op/op.Settings.php index 6a580e144..9e0b6b376 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -164,6 +164,7 @@ if ($action == "saveSettings") $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp"); $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp"); $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp"); + $settings->_enableUpdateRevApp = getBoolValue("enableUpdateRevApp"); $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion"); $settings->_enableVersionModification = getBoolValue("enableVersionModification"); $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames"); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 911192cef..5162b0904 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -612,6 +612,10 @@ if(!is_writeable($settings->_configFilePath)) { : _enableSelfRevApp) echo "checked" ?> /> + "> + : + _enableUpdateRevApp) echo "checked" ?> /> + "> : _enableVersionDeletion) echo "checked" ?> /> diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 98a113026..03105a42b 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -407,11 +407,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { /* Retrieve linked documents */ $links = $document->getDocumentLinks(); - $links = SeedDMS_Core_DMS::filterDocumentLinks($user, $links); + $links = SeedDMS_Core_DMS::filterDocumentLinks($user, $links, 'target'); /* Retrieve reverse linked documents */ $reverselinks = $document->getReverseDocumentLinks(); - $reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks); + $reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks, 'source'); /* Retrieve latest content */ $latestContent = $document->getLatestContent(); @@ -725,10 +725,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "