gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-10 05:26:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-09-06 08:24:38 +02:00
commit 10c89c9e5b
26 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
languages/ar_EG/lang.inc
View File

@ -1471,6 +1471,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'يجب تحديد حالات مسار العمل قبل تحديد مسار العمل.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'ادارة حالات مسار العمل',
'workflow_state_docstatus' => 'حالة المستند',

1
languages/bg_BG/lang.inc
View File

@ -1322,6 +1322,7 @@ $text = array(
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Трябва първо да дефинирате състояние на процес, а след това да добавите процес.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Управление на състоянието на процеси',
'workflow_state_docstatus' => 'Състояние на документа',

1
languages/ca_ES/lang.inc
View File

@ -1327,6 +1327,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => '',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => '',
'workflow_state_docstatus' => '',

1
languages/cs_CZ/lang.inc
View File

@ -1480,6 +1480,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Před přidáním pracovního postupu musíte definovat stavy pracovního postupu.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Správa stavů pracovních postupů',
'workflow_state_docstatus' => 'Stav dokumentu',

3
languages/de_DE/lang.inc
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 (2289), dgrutsch (21)
// Translators: Admin (2290), dgrutsch (21)
$text = array(
'2_factor_auth' => '2-Faktor Authentifizierung',
@ -1517,6 +1517,7 @@ URL: [url]',
'workflow_no_doc_released_state' => 'Das Dokument wird in keinem Workflow-Status freigegeben!',
'workflow_no_initial_state' => 'Keine Transition beginnt mit dem initialen Status des Workflows!',
'workflow_no_states' => 'Es muss zunächst mindestens ein Workflow-Status angelegt werden, um einen Workflow anlegen zu können.',
'workflow_save_layout' => 'Layout speichern',
'workflow_state' => 'Workflow-Status',
'workflow_states_management' => 'Workflow-Status-Management',
'workflow_state_docstatus' => 'Dokumentenstatus',

3
languages/en_GB/lang.inc
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 (1436), dgrutsch (7), netixw (14)
// Translators: Admin (1437), dgrutsch (7), netixw (14)
$text = array(
'2_factor_auth' => '2-factor authentication',
@ -1518,6 +1518,7 @@ URL: [url]',
'workflow_no_doc_released_state' => 'The document will not be released in a workflow state!',
'workflow_no_initial_state' => 'None of the transitions starts with the initial state of the workflow!',
'workflow_no_states' => 'You must first define workflow states, before adding a workflow.',
'workflow_save_layout' => 'Save layout',
'workflow_state' => 'workflow state',
'workflow_states_management' => 'Workflow states management',
'workflow_state_docstatus' => 'Document status',

1
languages/es_ES/lang.inc
View File

@ -1486,6 +1486,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Debe definir un estado de flujo de trabajo, antes de añadir.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Gestión del estado de flujo de trabajo',
'workflow_state_docstatus' => 'Estado de Documento',

5
languages/fr_FR/lang.inc
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 (1046), jeromerobert (50), lonnnew (9)
// Translators: Admin (1047), jeromerobert (50), lonnnew (9)
$text = array(
'2_factor_auth' => '',
@ -1336,7 +1336,7 @@ URL: [url]',
'thursday' => 'Jeudi',
'thursday_abbr' => 'Jeu.',
'timeline' => 'Chronologie',
'timeline_add_file' => '',
'timeline_add_file' => 'Nouvelle Pièce Jointe',
'timeline_add_version' => '',
'timeline_full_add_file' => '',
'timeline_full_add_version' => '',
@ -1453,6 +1453,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Vous devez d\'abord définir des états de workflow avant d\'ajouter un workflow.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Gestion d\'états de workflow',
'workflow_state_docstatus' => 'Etat du document',

1
languages/hr_HR/lang.inc
View File

@ -1507,6 +1507,7 @@ Internet poveznica: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Prije dodavanja toka rada najprije morate odrediti statuse toka rada.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Upravljanje statusima toka rada',
'workflow_state_docstatus' => 'Statusi dokumenta',

1
languages/hu_HU/lang.inc
View File

@ -1485,6 +1485,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'A munkafolyamat hozzáadása előtt munkafolyamat állapotokat kell meghatározni.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Munkafolyamat állapotok kezelése',
'workflow_state_docstatus' => 'Dokumentum állapot',

1
languages/it_IT/lang.inc
View File

@ -1519,6 +1519,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Prima di aggiungere un flusso di lavoro occorre definirne prima gli stati.',
'workflow_save_layout' => '',
'workflow_state' => 'Stato del flusso di lavoro',
'workflow_states_management' => 'Gestione stati del flusso di lavoro',
'workflow_state_docstatus' => 'Stato del documento',

1
languages/ko_KR/lang.inc
View File

@ -1500,6 +1500,7 @@ URL : [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => '워크플로를 추가하기 전에, 워크플로우 상태를 정의해야 합니다.',
'workflow_save_layout' => '',
'workflow_state' => '워크플로 상태',
'workflow_states_management' => '워크플로우 관리를 말한다',
'workflow_state_docstatus' => '문서의 상태가',

5
languages/nl_NL/lang.inc
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 (719), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
// Translators: Admin (720), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
$text = array(
'2_factor_auth' => '',
@ -526,7 +526,7 @@ URL: [url]',
'identical_version' => 'Nieuwe versie is identiek aan de huidige versie',
'import' => '',
'importfs' => '',
'import_fs' => '',
'import_fs' => 'Importeer van bestandssysteem',
'import_fs_warning' => '',
'include_content' => 'inclusief inhoud',
'include_documents' => 'Inclusief documenten',
@ -1513,6 +1513,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'U moet eerst workflow-statussen definiëren, voordat u een workflow toevoegt.',
'workflow_save_layout' => '',
'workflow_state' => 'workflow_states_managementWorkflow status beheer',
'workflow_states_management' => 'Workflow status beheer',
'workflow_state_docstatus' => 'Document status',

1
languages/pl_PL/lang.inc
View File

@ -1465,6 +1465,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Zanim dodasz proces musisz najpierw zdefiniować jego status.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Menadżer statusów procesu',
'workflow_state_docstatus' => 'Status dokumentu',

13
languages/pt_BR/lang.inc
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 (910), flaviove (627), lfcristofoli (352)
// Translators: Admin (915), flaviove (627), lfcristofoli (352)
$text = array(
'2_factor_auth' => '',
@ -525,7 +525,7 @@ URL: [url]',
'hu_HU' => 'Húngaro',
'id' => 'ID',
'identical_version' => 'Nova versão é idêntica à versão atual.',
'import' => '',
'import' => 'Importar',
'importfs' => '',
'import_fs' => 'Importar do sistema de arquivos',
'import_fs_warning' => '',
@ -1022,8 +1022,8 @@ URL: [url]',
'settings_dbVersion' => 'Esquema de banco de dados muito antigo',
'settings_defaultSearchMethod' => '',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => '',
'settings_defaultSearchMethod_valfulltext' => '',
'settings_defaultSearchMethod_valdatabase' => 'Banco de Dados',
'settings_defaultSearchMethod_valfulltext' => 'texto completo',
'settings_delete_install_folder' => 'Para utilizar SeedDMS, você deve excluir o arquivo ENABLE_INSTALL_TOOL do diretório de configuração',
'settings_disableSelfEdit' => 'Desativar Auto Editar',
'settings_disableSelfEdit_desc' => 'Se selecionado o usuário não poderá editar seu próprio perfil',
@ -1056,11 +1056,11 @@ URL: [url]',
'settings_enableFolderTree_desc' => 'Falso para não mostrar a árvore de pastas',
'settings_enableFullSearch' => 'Ativar Pesquisa de texto completo',
'settings_enableFullSearch_desc' => 'Ativar Pesquisa de texto completo',
'settings_enableGuestAutoLogin' => '',
'settings_enableGuestAutoLogin' => 'Habilitar auto acesso para visitante',
'settings_enableGuestAutoLogin_desc' => '',
'settings_enableGuestLogin' => 'Ativar Login de Visitante',
'settings_enableGuestLogin_desc' => 'Se você quiser quiser permitir login como convidado, marque esta opção. Nota: login de convidado deve ser usado apenas em um ambiente de confiança',
'settings_enableHelp' => '',
'settings_enableHelp' => 'Abilitar Ajuda',
'settings_enableHelp_desc' => '',
'settings_enableLanguageSelector' => 'Ativar Seletor de Idioma',
'settings_enableLanguageSelector_desc' => 'Mostrar seletor para idioma de interface de usuário após login.',
@ -1483,6 +1483,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Você deve primeiro definir estados de fluxo de trabalho, antes de adicionar um fluxo de trabalho.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Gestão de fluxo de trabalho estados',
'workflow_state_docstatus' => 'Status do documento',

1
languages/ro_RO/lang.inc
View File

@ -1508,6 +1508,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Mai întâi trebuie să definiți stările de Workflow, iar apoi să adăugați un Workflow.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Management stări Workflow',
'workflow_state_docstatus' => 'Status document',

1
languages/ru_RU/lang.inc
View File

@ -1515,6 +1515,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Сначала добавьте статусы процессов.',
'workflow_save_layout' => '',
'workflow_state' => 'Статус процесса',
'workflow_states_management' => 'Управление статусами процессов',
'workflow_state_docstatus' => 'Статус документа',

1
languages/sk_SK/lang.inc
View File

@ -1326,6 +1326,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => '',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => '',
'workflow_state_docstatus' => '',

1
languages/sv_SE/lang.inc
View File

@ -1471,6 +1471,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Du måste först fastlägga ett antal status för arbetsflödet, innan du kan lägga till ett arbetsflöde.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Status för arbetsflöde',
'workflow_state_docstatus' => 'Dokumentstatus',

1
languages/tr_TR/lang.inc
View File

@ -1487,6 +1487,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'İş akışı eklemeden önce iş akış durumu tanımlamalısınız.',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => 'Doküman durumu yönetimi',
'workflow_state_docstatus' => 'Dokümanın durumu',

1
languages/uk_UA/lang.inc
View File

@ -1508,6 +1508,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => 'Спочатку додайте статуси процесів.',
'workflow_save_layout' => '',
'workflow_state' => 'Статус процесу',
'workflow_states_management' => 'Керування статусами процесів',
'workflow_state_docstatus' => 'Статус документа',

1
languages/zh_CN/lang.inc
View File

@ -1328,6 +1328,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => '',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => '',
'workflow_state_docstatus' => '',

1
languages/zh_TW/lang.inc
View File

@ -1326,6 +1326,7 @@ URL: [url]',
'workflow_no_doc_released_state' => '',
'workflow_no_initial_state' => '',
'workflow_no_states' => '',
'workflow_save_layout' => '',
'workflow_state' => '',
'workflow_states_management' => '流程狀態管理',
'workflow_state_docstatus' => '文件流程狀態',

2
views/bootstrap/class.MyDocuments.php
View File

@ -629,7 +629,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
}
print "</a></td>";
print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=workflow\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
print "<td>".getOverallStatusText($res["status"])."</td>";
print "<td>".$res["version"]."</td>";
print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";

18
views/bootstrap/class.ViewDocument.php
View File

@ -784,11 +784,21 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
} else {
if($workflow) {
/* Check if user is involved in workflow */
$user_is_involved = false;
foreach($transitions as $transition) {
if($latestContent->triggerWorkflowTransitionIsAllowed($user, $transition)) {
$user_is_involved = true;
}
}
?>
<div class="tab-pane <?php if($currenttab == 'workflow') echo 'active'; ?>" id="workflow">
<?php
echo "<div class=\"row-fluid\">";
echo "<div class=\"span6\">";
if($user_is_involved || $user->isAdmin())
echo "<div class=\"span6\">";
else
echo "<div class=\"span12\">";
$this->contentContainerStart();
if($user->isAdmin()) {
if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
@ -962,11 +972,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
$this->contentContainerEnd();
echo "</div>";
echo "<div class=\"span6\">";
if($user_is_involved || $user->isAdmin()) {
echo "<div class=\"span6\">";
?>
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?><?php if($allowedtransitions) foreach($allowedtransitions as $tr) {echo "&transitions[]=".$tr->getID();} ?>" width="99%" height="661" style="border: 1px solid #AAA;"></iframe>
<?php
echo "</div>";
echo "</div>";
}
echo "</div>";
?>
</div>

1
views/bootstrap/class.WorkflowGraph.php
View File

@ -170,6 +170,7 @@ cy.on('zoom', function(evt) {
cy.layout({ name: 'cose', ready: function() {$('#png').attr('src', cy.png({'full': true}))} });
cy.maxZoom(2.5);
cy.minZoom(0.4);
$('#zoom button').text(Math.round(cy.zoom()*100)+'%');
$(document).ready(function() {
$('body').on('click', '#setlayout', function(ev){