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

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

Browse Source
This commit is contained in:
Uwe Steinmann 2016-09-06 10:10:17 +02:00
commit 813b265f6c
26 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -2289,7 +2289,7 @@ class SeedDMS_Core_DMS {
$workflows = array();
for ($i = 0; $i < count($resArr); $i++) {
$workflow = new SeedDMS_Core_Workflow($resArr[$i]["id"], $resArr[$i]["name"], $wkfstates[$resArr[$i]["initstate"]]);
$workflow = new SeedDMS_Core_Workflow($resArr[$i]["id"], $resArr[$i]["name"], $wkfstates[$resArr[$i]["initstate"]], $resArr[$i]["layoutdata"]);
$workflow->setDMS($this);
$workflows[$i] = $workflow;
}

2
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -4919,7 +4919,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
return false;
if(!$recs)
return false;
$this->_workflow = new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->_dms->getWorkflowState($recs[0]['initstate']));
$this->_workflow = new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->_dms->getWorkflowState($recs[0]['initstate']), $recs[0]["layoutdata"]);
$this->_workflow->setDMS($this->_document->_dms);
}
return $this->_workflow;

1
languages/ar_EG/lang.inc
View File

@ -788,6 +788,7 @@ URL: [url]',
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'اعادة تحميل',
'rejected' => 'مرفوض',
'released' => 'منشور',

1
languages/bg_BG/lang.inc
View File

@ -689,6 +689,7 @@ $text = array(
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'Обнови',
'rejected' => 'Отказан',
'released' => 'Утвърден',

1
languages/ca_ES/lang.inc
View File

@ -694,6 +694,7 @@ URL: [url]',
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'Refresh',
'rejected' => 'Rebutjat',
'released' => 'Publicat',

1
languages/cs_CZ/lang.inc
View File

@ -799,6 +799,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'Obnovit',
'rejected' => 'Odmítnuto',
'released' => 'Vydáno',

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 (2290), dgrutsch (21)
// Translators: Admin (2291), dgrutsch (21)
$text = array(
'2_factor_auth' => '2-Faktor Authentifizierung',
@ -812,6 +812,7 @@ URL: [url]',
'receipt_status' => 'Status',
'receipt_summary' => 'Übersicht Bestätigungen',
'recipients' => 'Empfänger',
'redraw' => 'Neu zeichnen',
'refresh' => 'Aktualisieren',
'rejected' => 'abgelehnt',
'released' => 'freigegeben',

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 (1437), dgrutsch (7), netixw (14)
// Translators: Admin (1438), dgrutsch (7), netixw (14)
$text = array(
'2_factor_auth' => '2-factor authentication',
@ -813,6 +813,7 @@ URL: [url]',
'receipt_status' => 'Status',
'receipt_summary' => 'Receipt summary',
'recipients' => 'Recipients',
'redraw' => 'Redraw',
'refresh' => 'Refresh',
'rejected' => 'Rejected',
'released' => 'Released',

1
languages/es_ES/lang.inc
View File

@ -803,6 +803,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'Actualizar',
'rejected' => 'Rechazado',
'released' => 'Publicado',

1
languages/fr_FR/lang.inc
View File

@ -800,6 +800,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'Actualiser',
'rejected' => 'Rejeté',
'released' => 'Publié',

1
languages/hr_HR/lang.inc
View File

@ -807,6 +807,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
'receipt_status' => '',
'receipt_summary' => 'Sažetak prijema',
'recipients' => 'Primatelji',
'redraw' => '',
'refresh' => 'Osvježi',
'rejected' => 'Odbijeno',
'released' => 'Obrađeno',

1
languages/hu_HU/lang.inc
View File

@ -803,6 +803,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'Frissítés',
'rejected' => 'Elutasított',
'released' => 'Kiadott',

1
languages/it_IT/lang.inc
View File

@ -814,6 +814,7 @@ URL: [url]',
'receipt_status' => 'Status',
'receipt_summary' => 'Sommario ricezione',
'recipients' => 'Cartelle',
'redraw' => '',
'refresh' => 'Ricarica',
'rejected' => 'Rifiutato',
'released' => 'Rilasciato',

1
languages/ko_KR/lang.inc
View File

@ -800,6 +800,7 @@ URL : [url]',
'receipt_status' => '',
'receipt_summary' => '접수증 요약',
'recipients' => '받는 사람',
'redraw' => '',
'refresh' => '새로 고침',
'rejected' => '거부',
'released' => '발표',

1
languages/nl_NL/lang.inc
View File

@ -806,6 +806,7 @@ URL: [url]',
'receipt_status' => 'Status ontvangst',
'receipt_summary' => 'Samenvatting',
'recipients' => 'Ontvangers',
'redraw' => '',
'refresh' => 'Verversen',
'rejected' => 'Afgewezen',
'released' => 'Gepubliceerd',

1
languages/pl_PL/lang.inc
View File

@ -796,6 +796,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'Odśwież',
'rejected' => 'Odrzucony',
'released' => 'Zatwierdzony',

1
languages/pt_BR/lang.inc
View File

@ -801,6 +801,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'Atualizar',
'rejected' => 'Rejected',
'released' => 'Released',

1
languages/ro_RO/lang.inc
View File

@ -808,6 +808,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => 'Destinatari',
'redraw' => '',
'refresh' => 'Refresh',
'rejected' => 'Respins',
'released' => 'Final(Released)',

1
languages/ru_RU/lang.inc
View File

@ -810,6 +810,7 @@ URL: [url]',
'receipt_status' => '',
'receipt_summary' => 'Сводка по получению',
'recipients' => 'Получатели',
'redraw' => '',
'refresh' => 'Обновить',
'rejected' => 'Отклонён',
'released' => 'Утверждён',

1
languages/sk_SK/lang.inc
View File

@ -693,6 +693,7 @@ URL: [url]',
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => '',
'rejected' => 'Odmietnuté',
'released' => 'Vydané',

1
languages/sv_SE/lang.inc
View File

@ -788,6 +788,7 @@ URL: [url]',
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'Uppdatera',
'rejected' => 'Avvisat',
'released' => 'Klart för användning',

1
languages/tr_TR/lang.inc
View File

@ -804,6 +804,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => 'Yenile',
'rejected' => 'Reddedildi',
'released' => 'Yayınlandı',

1
languages/uk_UA/lang.inc
View File

@ -810,6 +810,7 @@ URL: [url]',
'receipt_status' => '',
'receipt_summary' => 'Підсумки отримання',
'recipients' => 'Отримувачі',
'redraw' => '',
'refresh' => 'Оновити',
'rejected' => 'Відхилений',
'released' => 'Затверджений',

1
languages/zh_CN/lang.inc
View File

@ -695,6 +695,7 @@ URL: [url]',
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => '',
'rejected' => '拒绝',
'released' => '发布',

1
languages/zh_TW/lang.inc
View File

@ -693,6 +693,7 @@ URL: [url]',
'receipt_status' => '',
'receipt_summary' => '',
'recipients' => '',
'redraw' => '',
'refresh' => '',
'rejected' => '拒絕',
'released' => '發佈',

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

@ -33,6 +33,11 @@ class SeedDMS_View_WorkflowGraph extends SeedDMS_Bootstrap_Style {
function js() { /* {{{ */
$this->workflow = $this->params['workflow'];
/* curtransitions is a list of transition that shall be highlighted.
* It is used to mark the current transition a user can trigger.
* Setting this will automatically show all other transitions with
* higher opacity.
*/
$this->curtransitions = $this->params['transitions'];
header('Content-Type: application/javascript; charset=UTF-8');
@ -232,6 +237,7 @@ $(document).ready(function() {
$this->seentrans = array();
$this->states = array();
$this->actions = array();
$highlightstates = array();
foreach($transitions as $transition) {
$action = $transition->getAction();
$maxtime = $transition->getMaxTime();
@ -264,46 +270,43 @@ $(document).ready(function() {
name: \"".str_replace('"', "\\\"", $action->getName())/*.($unames ? "\\n(".str_replace('"', "\\\"", implode(", ", $unames)).")" : '').($gnames ? "\\n(".str_replace('"', "\\\"", implode(", ", $gnames)).")" : '')*/."\"
},".(isset($positions[$nodeid]) ? "
position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")."
classes: 'action".($iscurtransition ? " current" : ($this->curtransitions ? " light" : ""))."',
classes: 'action".($iscurtransition ? " current" : ($this->curtransitions ? " light" : ""))."'".(!$this->curtransitions || $iscurtransition && $this->curtransitions ? ",
scratch: {
app: {groups: \"".str_replace('"', "\\\"", implode(", ", $gnames))."\", users: \"".str_replace('"', "\\\"", implode(", ", $unames))."\"}
}
}" : "")."
});\n";
}
if(!isset($this->states[$state->getID()])) {
/* Collect all states and remember those which are part of a
* current transition.
*/
if(!isset($this->states[$state->getID()]) || $iscurtransition) {
if($iscurtransition)
$highlightstates[] = $state->getID();
$this->states[$state->getID()] = $state;
$initstate = '';
if($state == $this->workflow->getInitState())
$initstate = getMLText('workflow_initstate');
$nodeid = "S".$state->getID();
echo "cy.add({
data: {
id: '".$nodeid."',
name: \"".str_replace('"', "\\\"", $state->getName()/*."\\n".$initstate*/)."\"
},".(isset($positions[$nodeid]) ? "
position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")."
classes: 'state ".($state == $this->workflow->getInitState() ? 'init' : '')."'
});\n";
}
if(!isset($this->states[$nextstate->getID()])) {
if(!isset($this->states[$nextstate->getID()]) || $iscurtransition) {
if($iscurtransition)
$highlightstates[] = $nextstate->getID();
$this->states[$nextstate->getID()] = $nextstate;
$docstatus = $nextstate->getDocumentStatus();
$nodeid = "S".$nextstate->getID();
echo "cy.add({
}
}
foreach($this->states as $state) {
$docstatus = $state->getDocumentStatus();
$nodeid = 'S'.$state->getID();
echo "cy.add({
data: {
id: '".$nodeid."',
name: '".str_replace('"', "\\\"", $nextstate->getName())/*.($docstatus == S_RELEASED || $docstatus == S_REJECTED ? "\\n(".getOverallStatusText($docstatus).")" : '')*/."'
name: \"".str_replace('"', "\\\"", $state->getName())."\"
},".(isset($positions[$nodeid]) ? "
position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")."
classes: 'state".($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ''))."'
classes: 'state".($state == $this->workflow->getInitState() ? ' init' : ($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ''))).($highlightstates && !in_array($state->getID(), $highlightstates) ? ' light' : '')."'
});\n";
}
}
foreach($transitions as $transition) {
if(!in_array($transition->getID(), $this->seentrans)) {
// if(!in_array($transition->getID(), $this->seentrans)) {
$state = $transition->getState();
$nextstate = $transition->getNextState();
$action = $transition->getAction();
@ -331,8 +334,8 @@ $(document).ready(function() {
},
classes: '".($iscurtransition ? " current" : ($this->curtransitions ? " light" : ""))."',
});\n";
$this->seentrans[] = $transition->getID();
}
// $this->seentrans[] = $transition->getID();
// }
}
}
?>