fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master' into BUG-9689

Browse Source
This commit is contained in:
Herbert Saal Gutierrez
2012-09-18 10:12:53 -04:00
parent a1b1df936d abc96eea4a
commit 179eef73e7
80 changed files with 1744 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gulliver/js/ext/locale/ext-lang-af.js
View File

@@ -177,6 +177,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Slaan";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Kanselleer";
Ext.ux.grid.RowEditor.prototype.saveText = "Slaan";
Ext.ux.grid.RowEditor.prototype.cancelText = "Kanselleer";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Trek om grootte aan te pas.",

7
gulliver/js/ext/locale/ext-lang-am.js
View File

@@ -309,6 +309,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "አዳነ";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "አፈረሰ";
Ext.ux.grid.RowEditor.prototype.saveText = "አዳነ";
Ext.ux.grid.RowEditor.prototype.cancelText = "አፈረሰ";
}
if(Ext.grid.BooleanColumn){
Ext.apply(Ext.grid.BooleanColumn.prototype, {
trueText : "እሙን",

7
gulliver/js/ext/locale/ext-lang-bg.js
View File

@@ -271,6 +271,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Запази";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Отказ";
Ext.ux.grid.RowEditor.prototype.saveText = "Запази";
Ext.ux.grid.RowEditor.prototype.cancelText = "Отказ";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Влачете с мишката за да промените размера.",

7
gulliver/js/ext/locale/ext-lang-ca.js
View File

@@ -286,6 +286,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Guarda";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Cancel";
Ext.ux.grid.RowEditor.prototype.saveText = "Guarda";
Ext.ux.grid.RowEditor.prototype.cancelText = "Cancel";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Cliqueu i arrossegueu per canviar el tamany del panell.",

7
gulliver/js/ext/locale/ext-lang-cs.js
View File

@@ -303,6 +303,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Uložit";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Zrušit";
Ext.ux.grid.RowEditor.prototype.saveText = "Uložit";
Ext.ux.grid.RowEditor.prototype.cancelText = "Zrušit";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Tahem změnit velikost.",

7
gulliver/js/ext/locale/ext-lang-da.js
View File

@@ -289,6 +289,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Gem";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Annuller";
Ext.ux.grid.RowEditor.prototype.saveText = "Gem";
Ext.ux.grid.RowEditor.prototype.cancelText = "Annuller";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Træk for at ændre størrelsen.",

7
gulliver/js/ext/locale/ext-lang-de.js
View File

@@ -298,6 +298,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Speichern";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Abbrechen";
Ext.ux.grid.RowEditor.prototype.saveText = "Speichern";
Ext.ux.grid.RowEditor.prototype.cancelText = "Abbrechen";
}
if(Ext.grid.BooleanColumn){
Ext.apply(Ext.grid.BooleanColumn.prototype, {
trueText : "wahr",

7
gulliver/js/ext/locale/ext-lang-el_GR.js
View File

@@ -300,6 +300,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Αποθήκευση";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Ακύρωση";
Ext.ux.grid.RowEditor.prototype.saveText = "Αποθήκευση";
Ext.ux.grid.RowEditor.prototype.cancelText = "Ακύρωση";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Σύρετε για αλλαγή μεγέθους.",

7
gulliver/js/ext/locale/ext-lang-es.js
View File

@@ -289,6 +289,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Guardar";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Cancelar";
Ext.ux.grid.RowEditor.prototype.saveText = "Guardar";
Ext.ux.grid.RowEditor.prototype.cancelText = "Cancelar";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Arrastre para redimensionar.",

7
gulliver/js/ext/locale/ext-lang-fa.js
View File

@@ -265,6 +265,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "ذخیره";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "لغو کردن";
Ext.ux.grid.RowEditor.prototype.saveText = "ذخیره";
Ext.ux.grid.RowEditor.prototype.cancelText = "لغو کردن";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "درگ برای تغییر اندازه.",

7
gulliver/js/ext/locale/ext-lang-fi.js
View File

@@ -295,6 +295,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Tallenna";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Peruuta";
Ext.ux.grid.RowEditor.prototype.saveText = "Tallenna";
Ext.ux.grid.RowEditor.prototype.cancelText = "Peruuta";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Muuta kokoa vetämällä.",

7
gulliver/js/ext/locale/ext-lang-fr.js
View File

@@ -316,6 +316,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Enregistrer";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Annuler";
Ext.ux.grid.RowEditor.prototype.saveText = "Enregistrer";
Ext.ux.grid.RowEditor.prototype.cancelText = "Annuler";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Cliquer et glisser pour redimensionner le panneau.",

7
gulliver/js/ext/locale/ext-lang-fr_CA.js
View File

@@ -210,6 +210,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Enregistrer";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Annuler";
Ext.ux.grid.RowEditor.prototype.saveText = "Enregistrer";
Ext.ux.grid.RowEditor.prototype.cancelText = "Annuler";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Cliquer et glisser pour redimensionner le panneau.",

7
gulliver/js/ext/locale/ext-lang-gr.js
View File

@@ -167,6 +167,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Αποθήκευση";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Ακύρωση";
Ext.ux.grid.RowEditor.prototype.saveText = "Αποθήκευση";
Ext.ux.grid.RowEditor.prototype.cancelText = "Ακύρωση";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Óýñåôå ãéá áëëáãÞ ìåãÝèïõò.",

7
gulliver/js/ext/locale/ext-lang-he.js
View File

@@ -285,6 +285,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "להציל";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "לבטל";
Ext.ux.grid.RowEditor.prototype.saveText = "להציל";
Ext.ux.grid.RowEditor.prototype.cancelText = "לבטל";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : ".<2E><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",

7
gulliver/js/ext/locale/ext-lang-hr.js
View File

@@ -288,6 +288,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Spasiti";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Otkazati";
Ext.ux.grid.RowEditor.prototype.saveText = "Spasiti";
Ext.ux.grid.RowEditor.prototype.cancelText = "Otkazati";
}
if(Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Povuci za promjenu veličine.",

7
gulliver/js/ext/locale/ext-lang-hu.js
View File

@@ -289,6 +289,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Kivéve";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Töröl";
Ext.ux.grid.RowEditor.prototype.saveText = "Kivéve";
Ext.ux.grid.RowEditor.prototype.cancelText = "Töröl";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Átméretezés húzásra.",

7
gulliver/js/ext/locale/ext-lang-id.js
View File

@@ -295,6 +295,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Menyimpan";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Membatalkan";
Ext.ux.grid.RowEditor.prototype.saveText = "Menyimpan";
Ext.ux.grid.RowEditor.prototype.cancelText = "Membatalkan";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Seret untuk ubah ukuran.",

7
gulliver/js/ext/locale/ext-lang-it.js
View File

@@ -289,6 +289,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Salvare";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Annullare";
Ext.ux.grid.RowEditor.prototype.saveText = "Salvare";
Ext.ux.grid.RowEditor.prototype.cancelText = "Annullare";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Trascina per cambiare dimensioni.",

7
gulliver/js/ext/locale/ext-lang-ja.js
View File

@@ -289,6 +289,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "保存";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "キャンセル";
Ext.ux.grid.RowEditor.prototype.saveText = "保存";
Ext.ux.grid.RowEditor.prototype.cancelText = "キャンセル";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "ドラッグするとリサイズできます。",

7
gulliver/js/ext/locale/ext-lang-ko.js
View File

@@ -259,6 +259,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "저장";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "취소";
Ext.ux.grid.RowEditor.prototype.saveText = "저장";
Ext.ux.grid.RowEditor.prototype.cancelText = "취소";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "크기변경을 위해 드래그하세요.",

7
gulliver/js/ext/locale/ext-lang-lt.js
View File

@@ -304,6 +304,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Išgelbėti";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Atšaukti";
Ext.ux.grid.RowEditor.prototype.saveText = "Išgelbėti";
Ext.ux.grid.RowEditor.prototype.cancelText = "Atšaukti";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Patraukite juostelę.",

7
gulliver/js/ext/locale/ext-lang-lv.js
View File

@@ -169,6 +169,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Glābt";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Atsaukt";
Ext.ux.grid.RowEditor.prototype.saveText = "Glābt";
Ext.ux.grid.RowEditor.prototype.cancelText = "Atsaukt";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Velc, lai mainītu izmēru.",

7
gulliver/js/ext/locale/ext-lang-mk.js
View File

@@ -168,6 +168,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Зачувај";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Откажи";
Ext.ux.grid.RowEditor.prototype.saveText = "Зачувај";
Ext.ux.grid.RowEditor.prototype.cancelText = "Откажи";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Повлечете за менување на големината.",

7
gulliver/js/ext/locale/ext-lang-nl.js
View File

@@ -294,6 +294,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Besparen";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Annuleren";
Ext.ux.grid.RowEditor.prototype.saveText = "Besparen";
Ext.ux.grid.RowEditor.prototype.cancelText = "Annuleren";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip: 'Sleep om grootte aan te passen.',

7
gulliver/js/ext/locale/ext-lang-no_NB.js
View File

@@ -287,6 +287,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Lagre";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Avbryt";
Ext.ux.grid.RowEditor.prototype.saveText = "Lagre";
Ext.ux.grid.RowEditor.prototype.cancelText = "Avbryt";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Dra for å endre størrelse.",

7
gulliver/js/ext/locale/ext-lang-no_NN.js
View File

@@ -287,6 +287,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Lagre";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Avbryt";
Ext.ux.grid.RowEditor.prototype.saveText = "Lagre";
Ext.ux.grid.RowEditor.prototype.cancelText = "Avbryt";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Dra for å endre storleik.",

7
gulliver/js/ext/locale/ext-lang-pl.js
View File

@@ -296,6 +296,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Uratować";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Anulować";
Ext.ux.grid.RowEditor.prototype.saveText = "Uratować";
Ext.ux.grid.RowEditor.prototype.cancelText = "Anulować";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Przeciągnij aby zmienić rozmiar.",

7
gulliver/js/ext/locale/ext-lang-pt.js
View File

@@ -253,6 +253,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Salvar";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Cancelar";
Ext.ux.grid.RowEditor.prototype.saveText = "Salvar";
Ext.ux.grid.RowEditor.prototype.cancelText = "Cancelar";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Arraste para redimensionar.",

7
gulliver/js/ext/locale/ext-lang-pt_BR.js
View File

@@ -295,6 +295,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Salvar";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Cancelar";
Ext.ux.grid.RowEditor.prototype.saveText = "Salvar";
Ext.ux.grid.RowEditor.prototype.cancelText = "Cancelar";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Arraste para redimensionar.",

7
gulliver/js/ext/locale/ext-lang-pt_PT.js
View File

@@ -290,6 +290,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Salvar";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Cancelar";
Ext.ux.grid.RowEditor.prototype.saveText = "Salvar";
Ext.ux.grid.RowEditor.prototype.cancelText = "Cancelar";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Arastar para redimensionar.",

7
gulliver/js/ext/locale/ext-lang-ro.js
View File

@@ -288,6 +288,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Salva";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Anula";
Ext.ux.grid.RowEditor.prototype.saveText = "Salva";
Ext.ux.grid.RowEditor.prototype.cancelText = "Anula";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Trage pentru redimensionare.",

7
gulliver/js/ext/locale/ext-lang-ru.js
View File

@@ -305,6 +305,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "экономить";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "отменить";
Ext.ux.grid.RowEditor.prototype.saveText = "экономить";
Ext.ux.grid.RowEditor.prototype.cancelText = "отменить";
}
if(Ext.SplitLayoutRegion){
Ext.apply(Ext.SplitLayoutRegion.prototype, {
splitTip : "Тяните для изменения размера.",

7
gulliver/js/ext/locale/ext-lang-sk.js
View File

@@ -174,6 +174,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Ustriehnuť";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Odhlásiť";
Ext.ux.grid.RowEditor.prototype.saveText = "Ustriehnuť";
Ext.ux.grid.RowEditor.prototype.cancelText = "Odhlásiť";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Potiahnite pre zmenu rozmeru",

7
gulliver/js/ext/locale/ext-lang-sl.js
View File

@@ -169,6 +169,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Shrani";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Nadoknaditi";
Ext.ux.grid.RowEditor.prototype.saveText = "Shrani";
Ext.ux.grid.RowEditor.prototype.cancelText = "Nadoknaditi";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Potegni za razširitev.",

7
gulliver/js/ext/locale/ext-lang-sr.js
View File

@@ -172,6 +172,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "уштедети";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "отказати";
Ext.ux.grid.RowEditor.prototype.saveText = "уштедети";
Ext.ux.grid.RowEditor.prototype.cancelText = "отказати";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Povući za izmenu veličine.",

7
gulliver/js/ext/locale/ext-lang-sr_RS.js
View File

@@ -171,6 +171,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "уштедети";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "отказати";
Ext.ux.grid.RowEditor.prototype.saveText = "уштедети";
Ext.ux.grid.RowEditor.prototype.cancelText = "отказати";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Повући за измену величине.",

7
gulliver/js/ext/locale/ext-lang-sv_SE.js
View File

@@ -171,6 +171,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Spara";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Avbryt";
Ext.ux.grid.RowEditor.prototype.saveText = "Spara";
Ext.ux.grid.RowEditor.prototype.cancelText = "Avbryt";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Dra för att ändra storleken.",

7
gulliver/js/ext/locale/ext-lang-th.js
View File

@@ -287,6 +287,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "ประหยัด";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "ยกเลิก";
Ext.ux.grid.RowEditor.prototype.saveText = "ประหยัด";
Ext.ux.grid.RowEditor.prototype.cancelText = "ยกเลิก";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Drag to resize.",

7
gulliver/js/ext/locale/ext-lang-tr.js
View File

@@ -299,6 +299,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "Kurtarmak";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Iptal";
Ext.ux.grid.RowEditor.prototype.saveText = "Kurtarmak";
Ext.ux.grid.RowEditor.prototype.cancelText = "Iptal";
}
if(Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Yeniden boyutlandýrmak için sürükle.",

7
gulliver/js/ext/locale/ext-lang-ukr.js
View File

@@ -254,6 +254,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "економити";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Скасувати";
Ext.ux.grid.RowEditor.prototype.saveText = "економити";
Ext.ux.grid.RowEditor.prototype.cancelText = "Скасувати";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Тягніть для зміни розміру.",

7
gulliver/js/ext/locale/ext-lang-vn.js
View File

@@ -173,6 +173,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "lưu";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "hủy bỏ";
Ext.ux.grid.RowEditor.prototype.saveText = "lưu";
Ext.ux.grid.RowEditor.prototype.cancelText = "hủy bỏ";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "Kéo giữ chuột để thay đổi kích thước.",

7
gulliver/js/ext/locale/ext-lang-zh_CN.js
View File

@@ -255,6 +255,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "保存";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "取消";
Ext.ux.grid.RowEditor.prototype.saveText = "保存";
Ext.ux.grid.RowEditor.prototype.cancelText = "取消";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "拖动来改变尺寸.",

7
gulliver/js/ext/locale/ext-lang-zh_TW.js
View File

@@ -170,6 +170,13 @@ if(Ext.grid.PropertyColumnModel){
});
}
if (Ext.ux.grid.RowEditor) {
Ext.ux.grid.RowEditor.prototype.saveBtnText = "保存";
Ext.ux.grid.RowEditor.prototype.cancelBtnText = "取消";
Ext.ux.grid.RowEditor.prototype.saveText = "保存";
Ext.ux.grid.RowEditor.prototype.cancelText = "取消";
}
if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){
Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype, {
splitTip : "拖曳縮放大小.",

5
gulliver/js/form/core/form.js
View File

@@ -1021,7 +1021,7 @@ function G_Text(form, element, name)
break;
case 45:
if (me.mType == 'currency') {
newValue = currentValue.substring(0, currentValue.length);
newValue = currentValue.substring(0, currentValue.length).split('');
for (var numI = 0; newValue.length > numI; numI++) {
var campVal = newValue[numI];
if ((typeof(campVal) === 'number' || typeof(campVal) === 'string') && (campVal !== '') && (!isNaN(campVal))) {
@@ -1038,6 +1038,9 @@ function G_Text(form, element, name)
}
}
}
if (newValue.join) {
newValue = newValue.join('');
}
}
break;
default:

2
gulliver/js/maborak/core/maborak.js
View File

@@ -72,7 +72,7 @@ var maborak = function(forceCssLoad){
/* create Stylesheet BEGIN */
//erik: Now the core css is available just by demand
if (this.forceCssLoad === true) {
console.log('cargo css');
//console.log('cargo css');
var st =$dce('link');
st.rel ='stylesheet';
st.type ='text/css';

2
gulliver/js/maborak/core/module.dashboard.js
View File

@@ -237,7 +237,7 @@ leimnud.Package.Public({
if(this.drop.selected!==false)
{
var inp = this.drop.elements[this.drop.selected].value;
console.log(this.options.panel[inp]);
//console.log(this.options.panel[inp]);
//console.info("========================");
//console.info(i+":"+this.drop.selected);
//console.info(this.drop.elements[this.drop.selected].value);

2
gulliver/js/maborak/core/module.dynaform.js
View File

@@ -493,7 +493,7 @@ leimnud.Package.Public({
this.group={
elements:[
{text:'New Element',launch:function(){
console.log(this)
//console.log(this)
}.extend(this)},
]
};

8
gulliver/system/class.g.php
View File

@@ -1442,8 +1442,8 @@ $output = $outputHeader.$output;
case 'maborak.js' :
$oHeadPublisher =& headPublisher::getSingleton();
foreach ( $oHeadPublisher->maborakFiles as $fileJS ) {
//$output .= JSMin::minify ( file_get_contents ( $fileJS ) );
$output .= G::trimSourceCodeFile ($fileJS );
$output .= JSMin::minify ( file_get_contents ( $fileJS ) );
//$output .= G::trimSourceCodeFile ($fileJS );
}
break;
case 'maborak.loader.js':
@@ -1454,8 +1454,8 @@ $output = $outputHeader.$output;
}
break;
default :
$output = file_get_contents ( $filename ) ;
//$output = JSMin::minify ( file_get_contents ( $filename ) );
//$output = file_get_contents ( $filename ) ;
$output = JSMin::minify ( file_get_contents ( $filename ) );
//$output = G::trimSourceCodeFile ($filename );
}
print $output;

1
gulliver/system/class.headPublisher.php
View File

@@ -203,7 +203,6 @@ class headPublisher {
$this->addScriptFile ( "/js/widgets/js-calendar/unicode-letter.js" );
$this->addScriptFile ( "/js/widgets/js-calendar/lang/".$sysLang.".js" );
$this->addScriptFile ( "/js/widgets/js-calendar/lang/en.js" );
$head = '';
$head .= '<TITLE>' . $this->title . "</TITLE>\n";

148
gulliver/thirdparty/jsmin/jsmin.php vendored
View File

@@ -1,6 +1,6 @@
<?php
/**
* jsmin.php - PHP implementation of Douglas Crockford's JSMin.
* jsmin.php - PHP implementation of Douglas Crockford's JSMin á.
*
* This is pretty much a direct port of jsmin.c to PHP with just a few
* PHP-specific performance tweaks. Also, whereas jsmin.c reads from stdin and
@@ -40,14 +40,18 @@
* @author Ryan Grove <ryan@wonko.com>
* @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c)
* @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port)
* @copyright 2012 Adam Goforth <aag@adamgoforth.com> (Updates)
* @license http://opensource.org/licenses/mit-license.php MIT License
* @version 1.1.1 (2008-03-02)
* @link http://code.google.com/p/jsmin-php/
* @version 1.1.2 (2012-05-01)
* @link https://github.com/rgrove/jsmin-php
*/
class JSMin {
const ORD_LF = 10;
const ORD_SPACE = 32;
const ACTION_KEEP_A = 1;
const ACTION_DELETE_A = 2;
const ACTION_DELETE_A_B = 3;
protected $a = '';
protected $b = '';
@@ -59,6 +63,14 @@ class JSMin {
// -- Public Static Methods --------------------------------------------------
/**
* Minify Javascript
*
* @uses __construct()
* @uses min()
* @param string $js Javascript to be minified
* @return string
*/
public static function minify($js) {
$jsmin = new JSMin($js);
return $jsmin->min();
@@ -66,20 +78,41 @@ class JSMin {
// -- Public Instance Methods ------------------------------------------------
/**
* Constructor
*
* @param string $input Javascript to be minified
*/
public function __construct($input) {
$this->input = str_replace("\r\n", "\n", $input);
// $this->input = str_replace("\n", "", $this->input);
$this->inputLength = strlen($this->input);
}
// -- Protected Instance Methods ---------------------------------------------
protected function action($d) {
switch($d) {
case 1:
/**
* Action -- do something! What to do is determined by the $command argument.
*
* action treats a string as a single character. Wow!
* action recognizes a regular expression if it is preceded by ( or , or =.
*
* @uses next()
* @uses get()
* @throws JSMinException If parser errors are found:
* - Unterminated string literal
* - Unterminated regular expression set in regex literal
* - Unterminated regular expression literal
* @param int $command One of class constants:
* ACTION_KEEP_A Output A. Copy B to A. Get the next B.
* ACTION_DELETE_A Copy B to A. Get the next B. (Delete A).
* ACTION_DELETE_A_B Get the next B. (Delete B).
*/
protected function action($command) {
switch($command) {
case self::ACTION_KEEP_A:
$this->output .= $this->a;
case 2:
case self::ACTION_DELETE_A:
$this->a = $this->b;
if ($this->a === "'" || $this->a === '"') {
@@ -102,27 +135,46 @@ class JSMin {
}
}
case 3:
case self::ACTION_DELETE_A_B:
$this->b = $this->next();
if ($this->b === '/' && (
$this->a === '(' || $this->a === ',' || $this->a === '=' ||
$this->a === ':' || $this->a === '[' || $this->a === '!' ||
$this->a === '&' || $this->a === '|' || $this->a === '?')) {
$this->a === '&' || $this->a === '|' || $this->a === '?' ||
$this->a === '{' || $this->a === '}' || $this->a === ';' ||
$this->a === "\n" )) {
$this->output .= $this->a . $this->b;
for (;;) {
$this->a = $this->get();
if ($this->a === '/') {
if ($this->a === '[') {
/*
inside a regex [...] set, which MAY contain a '/' itself. Example: mootools Form.Validator near line 460:
return Form.Validator.getValidator('IsEmpty').test(element) || (/^(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]\.?){0,63}[a-z0-9!#$%&'*+/=?^_`{|}~-]@(?:(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)*[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\])$/i).test(element.get('value'));
*/
for (;;) {
$this->output .= $this->a;
$this->a = $this->get();
if ($this->a === ']') {
break;
} elseif ($this->a === '\\') {
$this->output .= $this->a;
$this->a = $this->get();
} elseif (ord($this->a) <= self::ORD_LF) {
throw new JSMinException('Unterminated regular expression '.
'literal.');
throw new JSMinException('Unterminated regular expression set in regex literal.');
}
}
} elseif ($this->a === '/') {
break;
} elseif ($this->a === '\\') {
$this->output .= $this->a;
$this->a = $this->get();
} elseif (ord($this->a) <= self::ORD_LF) {
throw new JSMinException('Unterminated regular expression literal.');
}
$this->output .= $this->a;
@@ -133,13 +185,18 @@ class JSMin {
}
}
/**
* Get next char. Convert ctrl char to space.
*
* @return string|null
*/
protected function get() {
$c = $this->lookAhead;
$this->lookAhead = null;
if ($c === null) {
if ($this->inputIndex < $this->inputLength) {
$c = $this->input[$this->inputIndex];
$c = substr($this->input, $this->inputIndex, 1);
$this->inputIndex += 1;
} else {
$c = null;
@@ -157,21 +214,41 @@ class JSMin {
return ' ';
}
/**
* Is $c a letter, digit, underscore, dollar sign, or non-ASCII character.
*
* @return bool
*/
protected function isAlphaNum($c) {
return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
}
/**
* Perform minification, return result
*
* @uses action()
* @uses isAlphaNum()
* @uses get()
* @uses peek()
* @return string
*/
protected function min() {
if (0 == strncmp($this->peek(), "\xef", 1)) {
$this->get();
$this->get();
$this->get();
}
$this->a = "\n";
$this->action(3);
$this->action(self::ACTION_DELETE_A_B);
while ($this->a !== null) {
switch ($this->a) {
case ' ':
if ($this->isAlphaNum($this->b)) {
$this->action(1);
$this->action(self::ACTION_KEEP_A);
} else {
$this->action(2);
$this->action(self::ACTION_DELETE_A);
}
break;
@@ -182,19 +259,21 @@ class JSMin {
case '(':
case '+':
case '-':
$this->action(1);
case '!':
case '~':
$this->action(self::ACTION_KEEP_A);
break;
case ' ':
$this->action(3);
$this->action(self::ACTION_DELETE_A_B);
break;
default:
if ($this->isAlphaNum($this->b)) {
$this->action(1);
$this->action(self::ACTION_KEEP_A);
}
else {
$this->action(2);
$this->action(self::ACTION_DELETE_A);
}
}
break;
@@ -203,11 +282,11 @@ class JSMin {
switch ($this->b) {
case ' ':
if ($this->isAlphaNum($this->a)) {
$this->action(1);
$this->action(self::ACTION_KEEP_A);
break;
}
$this->action(3);
$this->action(self::ACTION_DELETE_A_B);
break;
case "\n":
@@ -219,21 +298,21 @@ class JSMin {
case '-':
case '"':
case "'":
$this->action(1);
$this->action(self::ACTION_KEEP_A);
break;
default:
if ($this->isAlphaNum($this->a)) {
$this->action(1);
$this->action(self::ACTION_KEEP_A);
}
else {
$this->action(3);
$this->action(self::ACTION_DELETE_A_B);
}
}
break;
default:
$this->action(1);
$this->action(self::ACTION_KEEP_A);
break;
}
}
@@ -242,6 +321,15 @@ class JSMin {
return $this->output;
}
/**
* Get the next character, skipping over comments. peek() is used to see
* if a '/' is followed by a '/' or '*'.
*
* @uses get()
* @uses peek()
* @throws JSMinException On unterminated comment.
* @return string
*/
protected function next() {
$c = $this->get();
@@ -281,6 +369,12 @@ class JSMin {
return $c;
}
/**
* Get next char. If is ctrl character, translate to a space or newline.
*
* @uses get()
* @return string|null
*/
protected function peek() {
$this->lookAhead = $this->get();
return $this->lookAhead;

24
workflow/engine/classes/class.applications.php
View File

@@ -3,7 +3,7 @@
class Applications
{
public function getAll($userUid, $start=null, $limit=null, $action=null, $filter=null, $search=null, $process=null, $user=null, $status=null, $type=null, $dateFrom=null, $dateTo=null, $callback=null, $dir=null, $sort='APP_CACHE_VIEW.APP_NUMBER')
public function getAll($userUid, $start=null, $limit=null, $action=null, $filter=null, $search=null, $process=null, $user=null, $status=null, $type=null, $dateFrom=null, $dateTo=null, $callback=null, $dir=null, $sort='APP_CACHE_VIEW.APP_NUMBER', $category=null)
{
$callback = isset($callback) ? $callback : 'stcCallback1001';
$dir = isset($dir) ? $dir : 'DESC';
@@ -13,6 +13,7 @@ class Applications
$filter = isset($filter) ? $filter : '';
$search = isset($search) ? $search : '';
$process = isset($process)? $process : '';
$category = isset($category)? $category : '';
$user = isset($user) ? $user : '';
$status = isset($status) ? strtoupper($status) : '';
$action = isset($action) ? $action : 'todo';
@@ -28,6 +29,7 @@ class Applications
require_once ( "classes/model/AppDelay.php" );
require_once ( "classes/model/Fields.php" );
require_once ( "classes/model/Users.php" );
require_once ( "classes/model/Process.php" );
//$userUid = ( isset($_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '' ) ? $_SESSION['USER_LOGGED'] : null; <-- passed by param
$oAppCache = new AppCacheView();
@@ -125,14 +127,22 @@ class Applications
$CriteriaCount->add (AppCacheViewPeer::PRO_UID, $process, Criteria::EQUAL );
}
// add the category filter
if ($category != '') {
$Criteria->addAlias('CP', 'PROCESS');
$Criteria->add('CP.PRO_CATEGORY', $category, Criteria::EQUAL );
$Criteria->addJoin(AppCacheViewPeer::PRO_UID, 'CP.PRO_UID', Criteria::LEFT_JOIN);
$Criteria->addAsColumn('CATEGORY_UID', 'CP.PRO_CATEGORY');
}
// add the user filter
if ( $user != '' ) {
$Criteria->add (AppCacheViewPeer::USR_UID, $user, Criteria::EQUAL );
$Criteria->add(AppCacheViewPeer::USR_UID, $user, Criteria::EQUAL );
$CriteriaCount->add (AppCacheViewPeer::USR_UID, $user, Criteria::EQUAL );
}
if ( $status != '' ) {
$Criteria->add (AppCacheViewPeer::APP_STATUS, $status, Criteria::EQUAL );
$Criteria->add(AppCacheViewPeer::APP_STATUS, $status, Criteria::EQUAL );
$CriteriaCount->add (AppCacheViewPeer::APP_STATUS, $status, Criteria::EQUAL );
}
@@ -258,10 +268,14 @@ class Applications
//case 1. when the SEARCH action is selected and none filter, search criteria is defined,
//we need to count using the table APPLICATION, because APP_CACHE_VIEW takes 3 seconds
if ( $action == 'search' && $filter == '' && $search == '' && $process == '' && $status == '' && $dateFrom == '' && $dateTo == '') {
if ( $action == 'search' && $filter == '' && $search == '' && $process == '' && $status == '' && $dateFrom == '' && $dateTo == '' && $category == '') {
$totalCount = $oAppCache->getSearchAllCount();
$doCountAlreadyExecuted = true;
}
if ( $category != '' ) {
$totalCount = $oAppCache->getSearchCountCriteria();
$doCountAlreadyExecuted = true;
}
if ( $doCountAlreadyExecuted == false ) {
// in the case of reassign the distinct attribute shows a diferent count result comparing to the
@@ -289,7 +303,6 @@ class Applications
}
}
$totalCount = AppCacheViewPeer::doCount( $CriteriaCount, $distinct );
}
//add sortable options
@@ -312,6 +325,7 @@ class Applications
$oDatasetIndex = AppCacheViewPeer::doSelectRS( $Criteria );
$oDatasetIndex->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDatasetIndex->next();
$maxDelIndexList = array();
// a list of MAX_DEL_INDEXES is required in order to validate the right row
while($aRow = $oDatasetIndex->getRow()){
$maxDelIndexList[] = $aRow['MAX_DEL_INDEX'];

171
workflow/engine/classes/class.pmFunctions.php
View File

@@ -216,42 +216,6 @@ function literalDate($date, $lang='en')
throw $oException;
}
}
/**
* @method
*
* Pauses a specified case.
*
* @name pauseCase
* @label Pause Case
* @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#pauseCase.28.29
*
* @param string(32) | $sApplicationUID= "" | ID of the case | The unique ID of the case. The UID of the current case can be found in the system variable @@APPLICATION.
* @param string(32) | $iDelegation = 0| Delegation index of the case | The delegation index of the current task in the case.
* @param string(32) | $sUserUID = ""| ID user | The unique ID of the user who will pause the case.
* @param string(32) | $sUnpauseDate = null | Date | Optional parameter. The date in the format 'yyyy-mm-dd' indicating when to unpause the case.
* @return None | $none | None | None
*
*/
function pauseCase($sApplicationUID='', $iDelegation=0, $sUserUID='', $sUnpauseDate=null)
{
//var_dump($sApplicationUID, $iDelegation, $sUserUID, $sUnpauseDate);die(':|');
try {
if ($sApplicationUID == '') {
throw new Exception('The application UID cannot be empty!');
}
if ($iDelegation == 0) {
throw new Exception('The delegation index cannot be 0!');
}
if ($sUserUID == '') {
throw new Exception('The user UID cannot be empty!');
}
G::LoadClass('case');
$oCase = new Cases();
$oCase->pauseCase($sApplicationUID, $iDelegation, $sUserUID, $sUnpauseDate);
} catch (Exception $oException) {
throw $oException;
}
}
/**
* @method
*
@@ -1232,6 +1196,84 @@ function WSCancelCase($caseUid, $delIndex, $userUid)
return $response;
}
/**
* @method
*
* Pauses a specified case.
*
* @name WSPauseCase
* @label WS Pause Case
* @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#WSPauseCase.28.29
*
* @param string(32) | $caseUid | ID of the case | The unique ID of the case.
* @param int | $delIndex | Delegation index of the case | The delegation index of the current task in the case.
* @param string(32) | $userUid | ID user | The unique ID of the user who will pause the case.
* @param string(32) | $unpauseDate=null | Date | Optional parameter. The date in the format "yyyy-mm-dd" indicating when to unpause the case.
* @return array | $response | WS array | A WS Response associative array.
*
*/
function WSPauseCase($caseUid, $delIndex, $userUid, $unpauseDate=null)
{
$client = WSOpen();
$sessionId = $_SESSION["WS_SESSION_ID"];
$params = array(
"sessionId" => $sessionId,
"caseUid" => $caseUid,
"delIndex" => $delIndex,
"userUid" => $userUid,
"unpauseDate" => $unpauseDate
);
$result = $client->__soapCall("pauseCase", array($params));
$response = array();
$response["status_code"] = $result->status_code;
$response["message"] = $result->message;
$response["time_stamp"] = $result->timestamp;
return $response;
}
/**
* @method
*
* Unpause a specified case.
*
* @name WSUnpauseCase
* @label WS Unpause Case
* @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#WSUnpauseCase.28.29
*
* @param string(32) | $caseUid | ID of the case | The unique ID of the case.
* @param int | $delIndex | Delegation index of the case | The delegation index of the current task in the case.
* @param string(32) | $userUid | ID user | The unique ID of the user who will unpause the case.
* @return array | $response | WS array | A WS Response associative array.
*
*/
function WSUnpauseCase($caseUid, $delIndex, $userUid)
{
$client = WSOpen();
$sessionId = $_SESSION["WS_SESSION_ID"];
$params = array(
"sessionId" => $sessionId,
"caseUid" => $caseUid,
"delIndex" => $delIndex,
"userUid" => $userUid
);
$result = $client->__soapCall("unpauseCase", array($params));
$response = array();
$response["status_code"] = $result->status_code;
$response["message"] = $result->message;
$response["time_stamp"] = $result->timestamp;
return $response;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/** Local Services Functions **/
@@ -2345,3 +2387,60 @@ function PMFCancelCase($caseUid, $delIndex, $userUid)
}
}
/**
* @method
*
* Pauses a specified case.
*
* @name PMFPauseCase
* @label PMF Pauses a specified case.
*
* @param string(32) | $caseUid | ID of the case | The unique ID of the case.
* @param int | $delIndex | Delegation index of the case | The delegation index of the current task in the case.
* @param string(32) | $userUid | ID user | The unique ID of the user who will pause the case.
* @param string(32) | $unpauseDate=null | Date | Optional parameter. The date in the format "yyyy-mm-dd" indicating when to unpause the case.
* @return int | $result | Result of the pause | Returns 1 if the case is paused successfully; otherwise, returns 0 if an error occurred.
*
*/
function PMFPauseCase($caseUid, $delIndex, $userUid, $unpauseDate=null)
{
G::LoadClass("wsBase");
$ws = new wsBase();
$result = $ws->pauseCase($caseUid, $delIndex, $userUid, $unpauseDate);
if ($result->status_code == 0) {
return 1;
} else {
return 0;
}
}
/**
* @method
*
* Unpause a specified case.
*
* @name PMFUnpauseCase
* @label PMF Unpause a specified case.
*
* @param string(32) | $caseUid | ID of the case | The unique ID of the case.
* @param int | $delIndex | Delegation index of the case | The delegation index of the current task in the case.
* @param string(32) | $userUid | ID user | The unique ID of the user who will unpause the case.
* @return int | $result | Result of the unpause | Returns 1 if the case is unpause successfully; otherwise, returns 0 if an error occurred.
*
*/
function PMFUnpauseCase($caseUid, $delIndex, $userUid)
{
G::LoadClass("wsBase");
$ws = new wsBase();
$result = $ws->unpauseCase($caseUid, $delIndex, $userUid);
if ($result->status_code == 0) {
return 1;
} else {
return 0;
}
}

2
workflow/engine/classes/class.processMap.php
View File

@@ -371,8 +371,6 @@ class processMap {
$oPM->taskOptions[]=$taskOption;
}
$_SESSION['PROCESS'] = $sProcessUID;
$oJSON = new Services_JSON();
return $oJSON->encode($oPM);
} catch (Exception $oError) {

106
workflow/engine/classes/class.wsBase.php
View File

@@ -2897,5 +2897,111 @@ class wsBase
return $result;
}
}
/**
* Pause case
* @param string caseUid : ID of the case.
* @param int delIndex : Delegation index of the case.
* @param string userUid : The unique ID of the user who will pause the case.
* @param string unpauseDate : Optional parameter. The date in the format "yyyy-mm-dd" indicating when to unpause
* the case.
* @return $result will return an object
*/
public function pauseCase($caseUid, $delIndex, $userUid, $unpauseDate=null)
{
try {
if (empty($caseUid)) {
$result = new wsResponse(100, G::LoadTranslation("ID_REQUIRED_FIELD") . " caseUid");
return $result;
}
if (empty($delIndex)) {
$result = new wsResponse(100, G::LoadTranslation("ID_REQUIRED_FIELD") . " delIndex");
return $result;
}
if (empty($userUid)) {
$result = new wsResponse(100, G::LoadTranslation("ID_REQUIRED_FIELD") . " userUid");
return $result;
}
if (!empty($unpauseDate)) {
if (!preg_match("/^\d{4}-\d{2}-\d{2}$/", $unpauseDate)) {
$result = new wsResponse(100, G::LoadTranslation("ID_INVALID_DATA") . " $unpauseDate");
return $result;
}
}
$case = new Cases();
$case->pauseCase($caseUid, $delIndex, $userUid, $unpauseDate);
//Response
$res = new wsResponse(0, G::LoadTranslation("ID_COMMAND_EXECUTED_SUCCESSFULLY"));
$result = array(
"status_code" => $res->status_code,
"message" => $res->message,
"timestamp" => $res->timestamp
);
return $result;
} catch (Exception $e) {
$result = wsResponse(100, $e->getMessage());
return $result;
}
}
/**
* Unpause case
* @param string caseUid : ID of the case.
* @param int delIndex : Delegation index of the case.
* @param string userUid : The unique ID of the user who will unpause the case.
* @return $result will return an object
*/
public function unpauseCase($caseUid, $delIndex, $userUid)
{
try {
if (empty($caseUid)) {
$result = new wsResponse(100, G::LoadTranslation("ID_REQUIRED_FIELD") . " caseUid");
return $result;
}
if (empty($delIndex)) {
$result = new wsResponse(100, G::LoadTranslation("ID_REQUIRED_FIELD") . " delIndex");
return $result;
}
if (empty($userUid)) {
$result = new wsResponse(100, G::LoadTranslation("ID_REQUIRED_FIELD") . " userUid");
return $result;
}
$case = new Cases();
$case->unpauseCase($caseUid, $delIndex, $userUid);
//Response
$res = new wsResponse(0, G::LoadTranslation("ID_COMMAND_EXECUTED_SUCCESSFULLY"));
$result = array(
"status_code" => $res->status_code,
"message" => $res->message,
"timestamp" => $res->timestamp
);
return $result;
} catch (Exception $e) {
$result = wsResponse(100, $e->getMessage());
return $result;
}
}
}

2
workflow/engine/classes/model/Users.php
View File

@@ -228,13 +228,11 @@ public function userExists($UsrUid)
}
function loadByUsernameInArray($sUsername){
echo $sUsername;
$c = $this->loadByUsername($sUsername);
$rs = UsersPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next();
$row = $rs->getRow();
print_r($row);
return $row;
}

48
workflow/engine/classes/model/UsersProperties.php
View File

@@ -262,8 +262,44 @@ class UsersProperties extends BaseUsersProperties
if (substr(SYS_SKIN, 0, 2) == 'ux' && SYS_SKIN != 'uxs') {
$url = '/sys' . SYS_SYS . '/' . $this->lang . '/' . SYS_SKIN . '/main';
global $RBAC;
G::loadClass('configuration');
$oConf = new Configurations;
$oConf->loadConfig($x, 'USER_PREFERENCES','','',$_SESSION['USER_LOGGED'],'');
if ( sizeof($oConf->aConfig) > 0) {
if ($oConf->aConfig['DEFAULT_MENU'] == 'PM_USERS') {
$oConf->aConfig['DEFAULT_MENU'] = 'PM_SETUP';
}
switch ($oConf->aConfig['DEFAULT_MENU']) {
case 'PM_SETUP':
if ($RBAC->userCanAccess('PM_SETUP') == 1) {
$getUrl = 'admin';
}
break;
case 'PM_FACTORY':
if ($RBAC->userCanAccess('PM_FACTORY') == 1) {
$getUrl = 'designer';
}
break;
case 'PM_CASES':
if ($RBAC->userCanAccess('PM_CASES') == 1) {
$getUrl = 'home';
}
break;
case 'PM_USERS':
if ($RBAC->userCanAccess('PM_USERS') == 1) {
$getUrl = 'admin';
}
break;
case 'PM_DASHBOARD':
if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
$getUrl = 'dashboard';
}
break;
}
$url = $url."?st=".$getUrl;
}
}
return $url;
}
@@ -351,13 +387,11 @@ class UsersProperties extends BaseUsersProperties
if( sizeof($oConf->aConfig) > 0) { // this user has a configuration record
// backward compatibility, because now, we don't have user and dashboard menu.
if ($oConf->aConfig['DEFAULT_MENU'] == 'PM_USERS')
if ($oConf->aConfig['DEFAULT_MENU'] == 'PM_USERS') {
$oConf->aConfig['DEFAULT_MENU'] = 'PM_SETUP';
}
if ($oConf->aConfig['DEFAULT_MENU'] == 'PM_DASHBOARD')
$oConf->aConfig['DEFAULT_MENU'] = 'PM_SETUP';
switch($oConf->aConfig['DEFAULT_MENU']) {
switch ($oConf->aConfig['DEFAULT_MENU']) {
case 'PM_SETUP':
if ($RBAC->userCanAccess('PM_SETUP') == 1) {
$url = 'setup/main';
@@ -380,7 +414,7 @@ class UsersProperties extends BaseUsersProperties
break;
case 'PM_DASHBOARD':
if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
$url = 'dashboard/dashboard';
$url = 'dashboard/main';
}
break;
}

4
workflow/engine/controllers/main.php
View File

@@ -201,9 +201,11 @@ class Main extends Controller
//get date of next beat
$nextBeatDate = $oServerConf->getHeartbeatProperty('HB_NEXT_BEAT_DATE','HEART_BEAT_CONF');
$this->memcache->set('nextBeatDate', $nextBeatDate, 1*3600);
} else {
$sflag = '1';
}
if (($sflag == 1) && ((strtotime("now") > $nextBeatDate) || is_null($nextBeatDate))) {
if (($sflag == '1') && ((strtotime("now") > $nextBeatDate) || is_null($nextBeatDate))) {
//To do: we need to change to ExtJs
$this->setJSVar('flagHeartBeat', 1);
} else {

24
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -909,13 +909,29 @@ function documentVersionHistory()
G::RenderPage ('publish', 'raw');
}
function overwriteFile ($node, $fileName) {
global $RBAC;
require_once ("classes/model/AppFolder.php");
require_once ("classes/model/AppDocument.php");
$appDocument = new AppDocument();
$pMFolder = new AppFolder();
$user = ($RBAC->userCanAccess('PM_ALLCASES') == 1) ? '' : $_SESSION['USER_LOGGED'];
$folderContentObj = $pMFolder->getFolderContent ($node, array(), null, null, '', '', $user);
foreach ($folderContentObj['documents'] as $key => $value) {
if ($folderContentObj['documents'][$key]['APP_DOC_FILENAME'] == $fileName) {
$appDocument->remove(trim($folderContentObj['documents'][$key]['APP_DOC_UID']), $folderContentObj['documents'][$key]['DOC_VERSION']);
}
}
}
function uploadExternalDocument()
{
$response['action']=$_POST['action']. " - ".$_POST['option'];
$response['error']="error";
$response['message']="error";
$response['success']=false;
if (isset($_POST["confirm"]) && $_POST["confirm"]=="true") {
$overwrite = (isset($_REQUEST['overwrite_files'])) ? $_REQUEST['overwrite_files'] : false;
if (isset($_POST["confirm"]) && $_POST["confirm"] == "true") {
//G::pr($_FILES);
if (isset($_FILES['uploadedFile'])) {
$uploadedInstances=count($_FILES['uploadedFile']['name']);
@@ -923,6 +939,12 @@ function uploadExternalDocument()
$sw_error_exists=isset($_FILES['uploadedFile']['error']);
$emptyInstances=0;
$quequeUpload=array();
//overwrite files
if ($overwrite) {
for ($i=0; $i<$uploadedInstances; $i++) {
overwriteFile($_REQUEST['dir'], stripslashes($_FILES['uploadedFile']['name'][$i]));
}
}
// upload files & check for errors
for ($i=0; $i<$uploadedInstances; $i++) {
$errors[$i] = null;

137
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -79,23 +79,26 @@
$oAppCache->confCasesList = $confCasesList;
//get values for the comboBoxes
$processes = getProcessArray($action, $userUid );
$processes[] = array ( '', G::LoadTranslation('ID_ALL_PROCESS'));
$status = getStatusArray($action, $userUid );
$category = getCategoryArray();
$users = getUserArray($action, $userUid );
$allUsers = getAllUsersArray($action);
$oHeadPublisher->assign( 'reassignReaderFields', $reassignReaderFields ); //sending the fields to get from proxy
$oHeadPublisher->addExtJsScript('cases/reassignList', false );
$oHeadPublisher->assign( 'pageSize', $pageSize ); //sending the page size
$oHeadPublisher->assign( 'columns', $columns ); //sending the columns to display in grid
$oHeadPublisher->assign( 'readerFields', $readerFields ); //sending the fields to get from proxy
$oHeadPublisher->assign( 'reassignColumns', $reassignColumns ); //sending the columns to display in grid
$oHeadPublisher->assign( 'action', $action ); //sending the fields to get from proxy
$oHeadPublisher->assign( 'PMDateFormat', $dateFormat ); //sending the fields to get from proxy
$oHeadPublisher->assign( 'statusValues', $status ); //sending the columns to display in grid
$oHeadPublisher->assign( 'processValues', $processes); //sending the columns to display in grid
$oHeadPublisher->assign( 'userValues', $users); //sending the columns to display in grid
$oHeadPublisher->assign( 'allUsersValues',$allUsers); //sending the columns to display in grid
$oHeadPublisher->assign('reassignReaderFields', $reassignReaderFields ); //sending the fields to get from proxy
$oHeadPublisher->addExtJsScript('cases/reassignList', false);
$oHeadPublisher->assign('pageSize', $pageSize); //sending the page size
$oHeadPublisher->assign('columns', $columns); //sending the columns to display in grid
$oHeadPublisher->assign('readerFields', $readerFields); //sending the fields to get from proxy
$oHeadPublisher->assign('reassignColumns', $reassignColumns); //sending the columns to display in grid
$oHeadPublisher->assign('action', $action); //sending the action to make
$oHeadPublisher->assign('PMDateFormat', $dateFormat); //sending the fields to get from proxy
$oHeadPublisher->assign('statusValues', $status); //Sending the listing of status
$oHeadPublisher->assign('processValues', $processes); //Sending the listing of processes
$oHeadPublisher->assign('solrConf', System::solrEnv()); //Sending the status of solar
$oHeadPublisher->assign('categoryValues', $category); //Sending the listing of categories
$oHeadPublisher->assign('userValues', $users); //Sending the listing of users
$oHeadPublisher->assign('allUsersValues',$allUsers); //Sending the listing of all users
@@ -122,95 +125,6 @@
$oHeadPublisher->assign('FORMATS',$c->getFormats());
G::RenderPage('publish', 'extJs');
//functions to fill the comboboxes in the case list page
function getProcessArray ( $action, $userUid ) {
global $oAppCache;
$processes = Array();
$processes[] = array ( '', G::LoadTranslation('ID_ALL_PROCESS') );
//get the list based in the action provided
// G::pr($action);die;
switch ( $action ) {
case 'draft' :
$cProcess = $oAppCache->getDraftListCriteria($userUid); //fast enough
break;
case 'sent' :
$cProcess = $oAppCache->getSentListProcessCriteria ($userUid); // fast enough
break;
case 'simple_search':
case 'search' :
//in search action, the query to obtain all process is too slow, so we need to query directly to
//process and content tables, and for that reason we need the current language in AppCacheView.
G::loadClass('configuration');
$oConf = new Configurations;
$oConf->loadConfig($x, 'APP_CACHE_VIEW_ENGINE','','','','');
$appCacheViewEngine = $oConf->aConfig;
$lang = isset($appCacheViewEngine['LANG']) ? $appCacheViewEngine['LANG'] : 'en';
$cProcess = new Criteria('workflow');
$cProcess->clearSelectColumns ( );
$cProcess->addSelectColumn ( ProcessPeer::PRO_UID );
$cProcess->addSelectColumn ( ContentPeer::CON_VALUE );
$del = DBAdapter::getStringDelimiter();
$conds = array();
$conds[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID );
$conds[] = array(ContentPeer::CON_CATEGORY, $del . 'PRO_TITLE' . $del);
$conds[] = array(ContentPeer::CON_LANG, $del . $lang . $del);
$cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
$cProcess->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$oDataset = ProcessPeer::doSelectRS($cProcess);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while($aRow = $oDataset->getRow()){
$processes[] = array ( $aRow['PRO_UID'], $aRow['CON_VALUE'] );
$oDataset->next();
}
return $processes;
break;
case 'unassigned' :
$cProcess = $oAppCache->getUnassignedListCriteria($userUid);
break;
case 'paused' :
$cProcess = $oAppCache->getPausedListCriteria($userUid);
break;
case 'to_revise' :
$cProcess = $oAppCache->getToReviseListCriteria($userUid);
break;
case 'to_reassign' :
$cProcess = $oAppCache->getToReassignListCriteria();
$cProcess->addAscendingOrderByColumn(AppCacheViewPeer::APP_PRO_TITLE);
break;
case 'gral' :
$cProcess = $oAppCache->getGeneralListCriteria();
$cProcess->addAscendingOrderByColumn(AppCacheViewPeer::APP_PRO_TITLE);
break;
case 'todo' :
default:
$cProcess = $oAppCache->getToDoListCriteria($userUid); //fast enough
break;
}
//get the processes for this user in this action
$cProcess->clearSelectColumns();
$cProcess->addSelectColumn(AppCacheViewPeer::PRO_UID);
$cProcess->addSelectColumn(AppCacheViewPeer::APP_PRO_TITLE);
$cProcess->setDistinct(AppCacheViewPeer::PRO_UID);
$oDataset = AppCacheViewPeer::doSelectRS($cProcess);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while($aRow = $oDataset->getRow()){
$processes[] = array ( $aRow['PRO_UID'], $aRow['APP_PRO_TITLE'] );
$oDataset->next();
}
return $processes;
}
function getUserArray ( $action, $userUid ) {
global $oAppCache;
$status = array();
@@ -241,6 +155,25 @@
return $users;
}
function getCategoryArray () {
global $oAppCache;
require_once 'classes/model/ProcessCategory.php';
$category[] = array("", G::LoadTranslation("ID_ALL_CATEGORIES"));
$criteria = new Criteria('workflow');
$criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_UID);
$criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_NAME);
$dataset = ProcessCategoryPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
while ($row = $dataset->getRow()) {
$category[] = array( $row['CATEGORY_UID'], $row['CATEGORY_NAME']);
$dataset->next();
}
return $category;
}
function getAllUsersArray ( $action ) {
global $oAppCache;
$status = array();

104
workflow/engine/methods/cases/casesList_Ajax.php
View File

@@ -28,20 +28,118 @@
require_once 'classes/model/AppDelay.php';
require_once 'classes/model/Process.php';
require_once 'classes/model/Task.php';
require_once ( "classes/model/AppCacheView.php" );
require_once ( "classes/model/AppDelegation.php" );
require_once ( "classes/model/AdditionalTables.php" );
require_once ( "classes/model/AppDelay.php" );
G::LoadClass('case');
$actionAjax = isset($_REQUEST['actionAjax'])?$_REQUEST['actionAjax']: null;
if ($actionAjax == "processListExtJs") {
$action = isset($_REQUEST['action']) ? $_REQUEST['action']: null;
$categoryUid = isset($_REQUEST['CATEGORY_UID']) ? $_REQUEST['CATEGORY_UID'] : null;
$userUid = ( isset($_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '' ) ? $_SESSION['USER_LOGGED'] : null;
if($actionAjax=="getUsersToReassign"){
global $oAppCache;
$oAppCache = new AppCacheView();
$processes = Array();
$processes[] = array ( '', G::LoadTranslation('ID_ALL_PROCESS') );
//get the list based in the action provided
switch ( $action ) {
case 'draft':
$cProcess = $oAppCache->getDraftListCriteria($userUid); //fast enough
break;
case 'sent':
$cProcess = $oAppCache->getSentListProcessCriteria ($userUid); // fast enough
break;
case 'simple_search':
case 'search':
//in search action, the query to obtain all process is too slow, so we need to query directly to
//process and content tables, and for that reason we need the current language in AppCacheView.
G::loadClass('configuration');
$oConf = new Configurations;
$oConf->loadConfig($x, 'APP_CACHE_VIEW_ENGINE','','','','');
$appCacheViewEngine = $oConf->aConfig;
$lang = isset($appCacheViewEngine['LANG']) ? $appCacheViewEngine['LANG'] : 'en';
$cProcess = new Criteria('workflow');
$cProcess->clearSelectColumns ( );
$cProcess->addSelectColumn ( ProcessPeer::PRO_UID );
$cProcess->addSelectColumn ( ContentPeer::CON_VALUE );
if ($categoryUid) {
$cProcess->add (ProcessPeer::PRO_CATEGORY, $categoryUid);
}
$del = DBAdapter::getStringDelimiter();
$conds = array();
$conds[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID );
$conds[] = array(ContentPeer::CON_CATEGORY, $del . 'PRO_TITLE' . $del);
$conds[] = array(ContentPeer::CON_LANG, $del . $lang . $del);
$cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
$cProcess->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$oDataset = ProcessPeer::doSelectRS($cProcess);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$processes[] = array ( $aRow['PRO_UID'], $aRow['CON_VALUE'] );
$oDataset->next();
}
return print G::json_encode($processes);
break;
case 'unassigned':
$cProcess = $oAppCache->getUnassignedListCriteria($userUid);
break;
case 'paused':
$cProcess = $oAppCache->getPausedListCriteria($userUid);
break;
case 'to_revise':
$cProcess = $oAppCache->getToReviseListCriteria($userUid);
break;
case 'to_reassign':
$cProcess = $oAppCache->getToReassignListCriteria();
$cProcess->addAscendingOrderByColumn(AppCacheViewPeer::APP_PRO_TITLE);
break;
case 'gral':
$cProcess = $oAppCache->getGeneralListCriteria();
$cProcess->addAscendingOrderByColumn(AppCacheViewPeer::APP_PRO_TITLE);
break;
case 'todo':
default:
$cProcess = $oAppCache->getToDoListCriteria($userUid); //fast enough
break;
}
//get the processes for this user in this action
$cProcess->clearSelectColumns();
$cProcess->addSelectColumn(AppCacheViewPeer::PRO_UID);
$cProcess->addSelectColumn(AppCacheViewPeer::APP_PRO_TITLE);
$cProcess->setDistinct(AppCacheViewPeer::PRO_UID);
if ($categoryUid) {
$cProcess->addAlias('CP', 'PROCESS');
$cProcess->add('CP.PRO_CATEGORY', $categoryUid, Criteria::EQUAL );
$cProcess->addJoin(AppCacheViewPeer::PRO_UID, 'CP.PRO_UID', Criteria::LEFT_JOIN);
$cProcess->addAsColumn('CATEGORY_UID', 'CP.PRO_CATEGORY');
}
$oDataset = AppCacheViewPeer::doSelectRS($cProcess);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$processes[] = array ( $aRow['PRO_UID'], $aRow['APP_PRO_TITLE'] );
$oDataset->next();
}
return print G::json_encode($processes);
}
if ($actionAjax=="getUsersToReassign") {
$_SESSION['TASK'] = $_REQUEST['TAS_UID'];
$case = new Cases();
$result->data = $case->getUsersToReassign($_SESSION['TASK'], $_SESSION['USER_LOGGED']);
print G::json_encode($result);
}
if($actionAjax=='reassignCase'){
if ($actionAjax=='reassignCase') {
$APP_UID = $_REQUEST["APP_UID"];
$DEL_INDEX = $_REQUEST["DEL_INDEX"];

4
workflow/engine/methods/cases/proxyCasesList.php
View File

@@ -7,6 +7,7 @@ $start = isset($_POST["start"])? $_POST["start"] : "0";
$limit = isset($_POST["limit"])? $_POST["limit"] : "25";
$filter = isset($_POST ["filter"])? $_POST["filter"] : "";
$process = isset($_POST["process"])? $_POST["process"] : "";
$category = isset($_POST["category"])? $_POST["category"] : "";
$status = isset($_POST["status"])? strtoupper($_POST["status"]) : "";
$user = isset($_POST["user"])? $_POST["user"] : "";
$search = isset($_POST["search"])? $_POST["search"] : "";
@@ -74,7 +75,8 @@ try {
$dateTo,
$callback,
$dir,
$sort
$sort,
$category
);
$result = G::json_encode($data);

7
workflow/engine/methods/login/authentication.php
View File

@@ -60,12 +60,15 @@ try {
//The user is inactive
case -3:
require_once 'classes/model/Users.php';
$user = new Users;
$user = new Users();
$aUser = $user->loadByUsernameInArray($usr);
switch ($aUser['USR_STATUS']) {
case 'VACATION':
$errLabel = 'ID_USER_ONVACATION';
$uid = $aUser['USR_UID'];
$RBAC->changeUserStatus($uid, 1);
$aUser['USR_STATUS'] = 'ACTIVE';
$user->update($aUser);
break;
case 'INACTIVE':
$errLabel = 'ID_USER_INACTIVE';

1
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -49,6 +49,7 @@ try {
switch($_REQUEST['action'])
{
case 'load':
$_SESSION['PROCESS'] = $oData->uid;
if ($oData->ct) {
$sOutput = $oProcessMap->load($oData->uid, true, $_SESSION['APPLICATION'], -1, $_SESSION['TASK'], $oData->ct);
}

77
workflow/engine/methods/services/pmos2.wsdl
View File

@@ -761,6 +761,45 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pauseCaseRequest">
<xs:complexType>
<xs:sequence>
<xs:element name="sessionId" type="xs:string"/>
<xs:element name="caseUid" type="xs:string"/>
<xs:element name="delIndex" type="xs:string"/>
<xs:element name="userUid" type="xs:string"/>
<xs:element name="unpauseDate" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pauseCaseResponse">
<xs:complexType>
<xs:sequence>
<xs:element name="status_code" type="xs:integer"/>
<xs:element name="message" type="xs:string"/>
<xs:element name="timestamp" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="unpauseCaseRequest">
<xs:complexType>
<xs:sequence>
<xs:element name="sessionId" type="xs:string"/>
<xs:element name="caseUid" type="xs:string"/>
<xs:element name="delIndex" type="xs:string"/>
<xs:element name="userUid" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="unpauseCaseResponse">
<xs:complexType>
<xs:sequence>
<xs:element name="status_code" type="xs:integer"/>
<xs:element name="message" type="xs:string"/>
<xs:element name="timestamp" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
</types>
@@ -965,6 +1004,18 @@
<message name="cancelCaseResponse">
<part name="parameters" element="xs0:cancelCaseResponse"/>
</message>
<message name="pauseCaseRequest">
<part name="parameters" element="xs0:pauseCaseRequest"/>
</message>
<message name="pauseCaseResponse">
<part name="parameters" element="xs0:pauseCaseResponse"/>
</message>
<message name="unpauseCaseRequest">
<part name="parameters" element="xs0:unpauseCaseRequest"/>
</message>
<message name="unpauseCaseResponse">
<part name="parameters" element="xs0:unpauseCaseResponse"/>
</message>
<portType name="ProcessMakerServiceSoap">
<operation name="login">
@@ -1111,6 +1162,14 @@
<input message="xs0:cancelCaseRequest"/>
<output message="xs0:cancelCaseResponse"/>
</operation>
<operation name="pauseCase">
<input message="xs0:pauseCaseRequest"/>
<output message="xs0:pauseCaseResponse"/>
</operation>
<operation name="unpauseCase">
<input message="xs0:unpauseCaseRequest"/>
<output message="xs0:unpauseCaseResponse"/>
</operation>
</portType>
<binding name="ProcessMakerServiceSoap" type="xs0:ProcessMakerServiceSoap">
@@ -1439,6 +1498,24 @@
<soap12:body use="literal"/>
</output>
</operation>
<operation name="pauseCase">
<soap12:operation soapAction="urn:pauseCase" soapActionRequired="true" style="document"/>
<input>
<soap12:body use="literal"/>
</input>
<output>
<soap12:body use="literal"/>
</output>
</operation>
<operation name="unpauseCase">
<soap12:operation soapAction="urn:unpauseCase" soapActionRequired="true" style="document"/>
<input>
<soap12:body use="literal"/>
</input>
<output>
<soap12:body use="literal"/>
</output>
</operation>
</binding>
<service name="ProcessMakerService">

48
workflow/engine/methods/services/soap2.php
View File

@@ -1102,6 +1102,52 @@ function cancelCase($params)
return $result;
}
function pauseCase($params)
{
$result = isValidSession($params->sessionId);
if ($result->status_code != 0) {
return $result;
}
if (ifPermission($params->sessionId, "PM_CASES") == 0) {
$result = new wsResponse(2, "You do not have privileges");
return $result;
}
$ws = new wsBase();
$result = $ws->pauseCase(
$params->caseUid,
$params->delIndex,
$params->userUid,
((isset($params->unpauseDate))? $params->unpauseDate : null)
);
return $result;
}
function unpauseCase($params)
{
$result = isValidSession($params->sessionId);
if ($result->status_code != 0) {
return $result;
}
if (ifPermission($params->sessionId, "PM_CASES") == 0) {
$result = new wsResponse(2, "You do not have privileges");
return $result;
}
$ws = new wsBase();
$result = $ws->unpauseCase($params->caseUid, $params->delIndex, $params->userUid);
return $result;
}
@@ -1144,5 +1190,7 @@ $server->addFunction("removeUserFromGroup");
$server->addFunction("getCaseNotes");
$server->addFunction("deleteCase");
$server->addFunction("cancelCase");
$server->addFunction("pauseCase");
$server->addFunction("unpauseCase");
$server->handle();

16
workflow/engine/methods/users/usersAjax.php
View File

@@ -358,7 +358,7 @@ switch($_POST['action'])
/* Saving preferences */
$def_lang = $form['PREF_DEFAULT_LANG'];
$def_menu = $form['PREF_DEFAULT_MENUSELECTED'];
$def_cases_menu = $form['PREF_DEFAULT_CASES_MENUSELECTED'];
$def_cases_menu = isset($form['PREF_DEFAULT_CASES_MENUSELECTED']) ? $form['PREF_DEFAULT_CASES_MENUSELECTED'] : '';
G::loadClass('configuration');
@@ -406,7 +406,6 @@ switch($_POST['action'])
$_SESSION['CURRENT_USER'] = $_POST['USR_UID'];
$oUser = new Users();
$aFields = $oUser->loadDetailed($_POST['USR_UID']);
$aFields['USR_STATUS'] = G::LoadTranslation('ID_' . $aFields['USR_STATUS']);
//Load Calendar options and falue for this user
G::LoadClass ( 'calendar' );
@@ -452,10 +451,10 @@ switch($_POST['action'])
$menuSelected = '';
if ($aFields['PREF_DEFAULT_MENUSELECTED'] != ''){
if ($aFields['PREF_DEFAULT_MENUSELECTED'] != '') {
foreach ( $RBAC->aUserInfo['PROCESSMAKER']['PERMISSIONS'] as $permission ) {
if($aFields['PREF_DEFAULT_MENUSELECTED']==$permission['PER_CODE']){
switch($permission['PER_CODE']){
if ($aFields['PREF_DEFAULT_MENUSELECTED']==$permission['PER_CODE']) {
switch ($permission['PER_CODE']) {
case 'PM_USERS' :
case 'PM_SETUP' :
$menuSelected = strtoupper(G::LoadTranslation('ID_SETUP'));
@@ -466,11 +465,15 @@ switch($_POST['action'])
case 'PM_FACTORY' :
$menuSelected = strtoupper(G::LoadTranslation('ID_APPLICATIONS'));
break;
case 'PM_DASHBOARD':
$menuSelected = strtoupper(G::LoadTranslation('ID_DASHBOARD'));
break;
}
}
}
}
$aFields['MENUSELECTED_NAME'] = $menuSelected;
$oMenu = new Menu();
@@ -510,6 +513,9 @@ switch($_POST['action'])
case 'PM_FACTORY':
$rows[] = Array('id'=>'PM_FACTORY', 'name'=>strtoupper(G::LoadTranslation('ID_APPLICATIONS')));
break;
case 'PM_DASHBOARD':
$rows[] = Array('id'=>'PM_DASHBOARD', 'name'=>strtoupper(G::LoadTranslation('ID_DASHBOARD')));
break;
}
}
print(G::json_encode($rows));

2
workflow/engine/methods/users/users_Ajax.php
View File

@@ -214,7 +214,7 @@ try {
case 'changeUserStatus':
$response = new stdclass();
if (isset($_REQUEST['USR_UID']) && isset($_REQUEST['NEW_USR_STATUS'])) {
$RBAC->changeUserStatus($_REQUEST['USR_UID'], $_REQUEST['NEW_USR_STATUS']);
$RBAC->changeUserStatus($_REQUEST['USR_UID'], ($_REQUEST['NEW_USR_STATUS'] == 'ACTIVE' ? 1 : 0));
require_once 'classes/model/Users.php';
$userInstance = new Users();
$userData = $userInstance->load($_REQUEST['USR_UID']);

2
workflow/engine/skinEngine/base/layout.html
View File

@@ -65,7 +65,6 @@
</table>
</td>
</tr>
{if $footer neq ''}
<tr height="100%">
<td height="100%">
<div class="Footer">
@@ -73,7 +72,6 @@
</div>
</td>
</tr>
{/if}
</table>
</body>
</html>

3
workflow/engine/skinEngine/uxmodern/css/style.css
View File

@@ -830,6 +830,7 @@ form.formSearch .Record
{
color:#2078A8;
text-decoration:none;
white-space:nowrap;
}
.pagedTableDefault, .pagedTableDefault .headerContent .tableOption a:hover
{
@@ -882,6 +883,7 @@ font-weight:bold;
text-decoration: none;
padding-left: 5px;
font: bold 11px Tahoma,sans-serif, MiscFixed;
white-space:nowrap;
}
.pagedTableDefault .pagedTable a:hover
{
@@ -960,6 +962,7 @@ font-weight:bold;
}
.pagedTableDefault .pagedTable .RowLink a{
display:block;
white-space:nowrap;
}
A.firstPage {

62
workflow/engine/templates/admin/calendarEdit.js
View File

@@ -5,9 +5,18 @@
* http://www.extjs.com/license
*/
var weekDays = [['- ALL -','- ' + _('ID_ALL') + ' -'],
['SUN',_('ID_WEEKDAY_ABB_0')],
['MON',_('ID_WEEKDAY_ABB_1')],
['TUE',_('ID_WEEKDAY_ABB_2')],
['WED',_('ID_WEEKDAY_ABB_3')],
['THU',_('ID_WEEKDAY_ABB_4')],
['FRI',_('ID_WEEKDAY_ABB_5')],
['SAT',_('ID_WEEKDAY_ABB_6')]];
comboStatusStore = new Ext.data.SimpleStore({
fields: ['id','value'],
data: [['- ALL -','- ALL -'],['SUN','SUN'],['MON','MON'],['TUE','TUE'],['WED','WED'],['THU','THU'],['FRI','FRI'],['SAT','SAT']]
data: weekDays
});
var get = '';
var vars = [], hash;
@@ -412,7 +421,6 @@ Ext.onReady( function() {
dataIndex: 'name',
width: 50,
sortable: true,
editor: {
xtype: 'combo',
id: 'calendarColumnDayCombo',
@@ -429,8 +437,14 @@ Ext.onReady( function() {
triggerAction: 'all',
emptyText: _('ID_SELECT_STATUS'),
selectOnFocus:true
},
renderer: function(value) {
for(var i = 0; i < weekDays.length; i++) {
if (weekDays[i].indexOf(value) > -1) {
return weekDays[i][1];
}
}
return '';
}
},
{
@@ -509,7 +523,7 @@ Ext.onReady( function() {
});
var editorHoliday = new Ext.ux.grid.RowEditor( {
saveText: 'Update'
saveText: _('ID_UPDATE')
} );
@@ -667,27 +681,27 @@ Ext.onReady( function() {
}
//camboDayArray;
var camboDayArray = [['- ALL -','- ALL -']];
var camboDayArray = [['- ALL -','- ' + _('ID_ALL') + ' -']];
if (calendarWorkDayStatusArray ['SUN'] == 'On') {
camboDayArray.push(['SUN','SUN']);
camboDayArray.push(['SUN',_('ID_WEEKDAY_ABB_0')]);
}
if (calendarWorkDayStatusArray ['MON'] == 'On') {
camboDayArray.push(['MON','MON']);
camboDayArray.push(['MON',_('ID_WEEKDAY_ABB_1')]);
}
if (calendarWorkDayStatusArray ['TUE'] == 'On') {
camboDayArray.push(['TUE','TUE']);
camboDayArray.push(['TUE',_('ID_WEEKDAY_ABB_2')]);
}
if (calendarWorkDayStatusArray ['WED'] == 'On') {
camboDayArray.push(['WED','WED']);
camboDayArray.push(['WED',_('ID_WEEKDAY_ABB_3')]);
}
if (calendarWorkDayStatusArray ['THU'] == 'On') {
camboDayArray.push(['THU','THU']);
camboDayArray.push(['THU',_('ID_WEEKDAY_ABB_4')]);
}
if (calendarWorkDayStatusArray ['FRI'] == 'On') {
camboDayArray.push(['FRI','FRI']);
camboDayArray.push(['FRI',_('ID_WEEKDAY_ABB_5')]);
}
if (calendarWorkDayStatusArray ['SAT'] == 'On') {
camboDayArray.push(['SAT','SAT']);
camboDayArray.push(['SAT',_('ID_WEEKDAY_ABB_6')]);
}
var comboStatusStore = new Ext.data.SimpleStore( {
@@ -812,7 +826,7 @@ Ext.onReady( function() {
columns: 4,
items: [
{
boxLabel : _('ID_SUN'),
boxLabel : _('ID_WEEKDAY_ABB_0'),
name: 'M0',
readOnly:true,
disabled:false,
@@ -821,7 +835,7 @@ Ext.onReady( function() {
}
},
{
boxLabel : _('ID_MON'),
boxLabel : _('ID_WEEKDAY_ABB_1'),
name: 'M1',
checked: true,
readOnly:true,
@@ -831,7 +845,7 @@ Ext.onReady( function() {
}
},
{
boxLabel : _('ID_TUE'),
boxLabel : _('ID_WEEKDAY_ABB_2'),
name: 'M2',
checked: true,
readOnly:true,
@@ -1245,27 +1259,27 @@ Ext.onReady( function() {
});
//camboDayArray;
var camboDayArray = [['- ALL -','- ALL -']];
var camboDayArray = [['- ALL -','- ' + _('ID_ALL') + ' -']];
if (calendarWorkDayStatusArray ['SUN'] == 'On') {
camboDayArray.push(['SUN','SUN']);
camboDayArray.push(['SUN',_('ID_WEEKDAY_ABB_0')]);
}
if (calendarWorkDayStatusArray ['MON'] == 'On') {
camboDayArray.push(['MON','MON']);
camboDayArray.push(['MON',_('ID_WEEKDAY_ABB_1')]);
}
if (calendarWorkDayStatusArray ['TUE'] == 'On') {
camboDayArray.push(['TUE','TUE']);
camboDayArray.push(['TUE',_('ID_WEEKDAY_ABB_2')]);
}
if (calendarWorkDayStatusArray ['WED'] == 'On') {
camboDayArray.push(['WED','WED']);
camboDayArray.push(['WED',_('ID_WEEKDAY_ABB_3')]);
}
if (calendarWorkDayStatusArray ['THU'] == 'On') {
camboDayArray.push(['THU','THU']);
camboDayArray.push(['THU',_('ID_WEEKDAY_ABB_4')]);
}
if (calendarWorkDayStatusArray ['FRI'] == 'On') {
camboDayArray.push(['FRI','FRI']);
camboDayArray.push(['FRI',_('ID_WEEKDAY_ABB_5')]);
}
if (calendarWorkDayStatusArray ['SAT'] == 'On') {
camboDayArray.push(['SAT','SAT']);
camboDayArray.push(['SAT',_('ID_WEEKDAY_ABB_6')]);
}
var comboStatusStore = new Ext.data.SimpleStore( {
fields: ['id','value'],

2
workflow/engine/templates/cases/caseHistoryDynaformPage.js
View File

@@ -271,7 +271,7 @@
var idUnique = md5(PRO_UID+APP_UID+TAS_UID+DYN_UID);
console.log(window.content);
//console.log(window.content);
var tabData = Ext.util.JSON.encode(historyDynaformGridHistoryGlobal);
var tabName = 'historyDynaformGridHistory_'+idUnique;

7
workflow/engine/templates/cases/casesDocuments.js
View File

@@ -288,7 +288,7 @@ function openActionDialog( caller, action ) {
uploadDocument:1,
search:1
};
if( dontNeedSelection[action] == null && selectedRows.length < 1 ) {
if( dontNeedSelection[action] == null || selectedRows.length < 1 ) {
Ext.Msg.alert( 'Error',TRANSLATIONS.ID_NO_ITEMS_SELECTED);
return false;
}
@@ -1898,6 +1898,8 @@ var documentsTab = {
tsm.on('selectionchange',
handleNodeClick);
// create the editor for the directory
// tree
var dirTreeEd = new Ext.tree.TreeEditor(
@@ -1914,6 +1916,9 @@ var documentsTab = {
// console.log("starting locatiobar first time");
Ext.getCmp("locationbarcmp").tree = Ext.getCmp("dirTreePanel");
Ext.getCmp("locationbarcmp").initComponent();
var node = dirTree.getNodeById("root");
node.select();
datastore.directory = 'root';
// console.log("location abr started first time");
}

94
workflow/engine/templates/cases/casesList.js
View File

@@ -394,6 +394,7 @@ Ext.onReady ( function() {
var ids = '';
var filterProcess = '';
var filterCategory = '';
var filterUser = '';
var caseIdToDelete = '';
var caseIdToUnpause = '';
@@ -793,6 +794,21 @@ Ext.onReady ( function() {
'</div></tpl>'
);
Ext.Ajax.request({
url : 'casesList_Ajax' ,
params : {actionAjax : 'processListExtJs',
action: action,
CATEGORY_UID: filterCategory},
success: function ( result, request ) {
processValues = Ext.util.JSON.decode(result.responseText);
comboProcess.getStore().removeAll();
comboProcess.getStore().loadData(processValues);
},
failure: function ( result, request) {
Ext.MessageBox.alert('Failed', result.responseText);
}
});
var comboProcess = new Ext.form.ComboBox({
width : 200,
boxMaxWidth : 200,
@@ -868,6 +884,53 @@ Ext.onReady ( function() {
iconCls: 'no-icon' //use iconCls if placing within menu to shift to right side of menu
});
var comboCategory = new Ext.form.ComboBox({
width : 200,
boxMaxWidth : 200,
editable : true,
displayField : 'CATEGORY_NAME',
valueField : 'CATEGORY_UID',
forceSelection : false,
emptyText : _('ID_PROCESS_NO_CATEGORY'),
selectOnFocus : true,
typeAhead : true,
mode : 'local',
autocomplete : true,
triggerAction : 'all',
store : new Ext.data.ArrayStore({
fields : ['CATEGORY_UID','CATEGORY_NAME'],
data : categoryValues
}),
listeners:{
scope: this,
'select': function() {
filterCategory = comboCategory.value;
storeCases.setBaseParam('category', filterCategory);
storeCases.setBaseParam('process', '');
storeCases.load({params:{category: filterCategory, start : 0 , limit : pageSize}});
Ext.Ajax.request({
url : 'casesList_Ajax' ,
params : {actionAjax : 'processListExtJs',
action: action,
CATEGORY_UID: filterCategory},
success: function ( result, request ) {
var data = Ext.util.JSON.decode(result.responseText);
comboProcess.getStore().removeAll();
comboProcess.getStore().loadData( data );
comboProcess.setValue('');
},
failure: function ( result, request) {
Ext.MessageBox.alert('Failed', result.responseText);
}
});
}},
iconCls: 'no-icon'
});
var btnSelectAll = new Ext.Button ({
text: _('CHECK_ALL'),
// text: 'Check All',
@@ -1393,6 +1456,8 @@ Ext.onReady ( function() {
value: ''
});
var optionCategory = (solrConf != true) ? [ _('ID_CATEGORY'), comboCategory, '-'] : [''] ;
var toolbarTodo = [
optionMenuOpen,
{
@@ -1408,6 +1473,7 @@ Ext.onReady ( function() {
'-',
btnAll,
'->', // begin using the right-justified button container
optionCategory,
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1429,6 +1495,7 @@ Ext.onReady ( function() {
'-',
btnAll,
'->', // begin using the right-justified button container
optionCategory,
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1450,6 +1517,7 @@ Ext.onReady ( function() {
'-',
btnAll,
'->', // begin using the right-justified button container
optionCategory,
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1473,6 +1541,7 @@ Ext.onReady ( function() {
menu: menuItems
},
'->',
optionCategory,
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1489,6 +1558,7 @@ Ext.onReady ( function() {
var toolbarToRevise = [
optionMenuOpen,
'->', // begin using the right-justified button container
optionCategory,
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1513,6 +1583,7 @@ Ext.onReady ( function() {
_("ID_USER"),
comboAllUsers,
"-",
optionCategory,
_("ID_PROCESS"),
comboProcess,
textSearch,
@@ -1530,6 +1601,7 @@ Ext.onReady ( function() {
'-',
btnAll,
'->', // begin using the right-justified button container
optionCategory,
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1546,6 +1618,8 @@ Ext.onReady ( function() {
' '
];
var toolbarSearch = [
' ',
_('ID_DELEGATE_DATE_FROM'),
@@ -1560,8 +1634,7 @@ Ext.onReady ( function() {
storeCases.setBaseParam('dateTo', dateTo.getValue());
storeCases.load({params:{ start : 0 , limit : pageSize }});
}
}),
'-'
})
];
var firstToolbarSearch = new Ext.Toolbar({
@@ -1571,6 +1644,7 @@ Ext.onReady ( function() {
items: [
optionMenuOpen,
'->',
optionCategory,
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1801,25 +1875,25 @@ var gridForm = new Ext.FormPanel({
//Manually trigger the data store load
switch (action) {
case "draft":
storeCases.setBaseParam("process", comboProcess.store.getAt(0).get(comboProcess.valueField));
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "sent":
storeCases.setBaseParam("process", comboProcess.store.getAt(0).get(comboProcess.valueField));
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("status", comboStatus.store.getAt(0).get(comboStatus.valueField));
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "to_revise":
storeCases.setBaseParam("process", comboProcess.store.getAt(0).get(comboProcess.valueField));
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "to_reassign":
storeCases.setBaseParam("user", comboAllUsers.store.getAt(0).get(comboAllUsers.valueField));
storeCases.setBaseParam("process", comboProcess.store.getAt(0).get(comboProcess.valueField));
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "search":
storeCases.setBaseParam("process", comboProcess.store.getAt(0).get(comboProcess.valueField));
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("status", comboStatus.store.getAt(0).get(comboStatus.valueField));
storeCases.setBaseParam("user", comboUser.store.getAt(0).get(comboUser.valueField));
storeCases.setBaseParam("search", textSearch.getValue());
@@ -1827,16 +1901,16 @@ var gridForm = new Ext.FormPanel({
storeCases.setBaseParam("dateTo", dateTo.getValue());
break;
case "unassigned":
storeCases.setBaseParam("process", comboProcess.store.getAt(0).get(comboProcess.valueField));
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "gral":
storeCases.setBaseParam("process", comboProcess.store.getAt(0).get(comboProcess.valueField));
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("search", textSearch.getValue());
break;
default:
//todo
storeCases.setBaseParam("process", comboProcess.store.getAt(0).get(comboProcess.valueField));
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("search", textSearch.getValue());
break;
}

8
workflow/engine/templates/cases/cases_DynaformHistory.php
View File

@@ -32,7 +32,9 @@ $oCase = new Cases();
$Fields = $oCase->loadCase($_SESSION['APPLICATION']);
// Load form info
$form = new Form($_REQUEST['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'], PATH_DYNAFORM, SYS_LANG, false);
if (isset($_REQUEST['DYN_UID']) && $_REQUEST['DYN_UID'] != '') {
$form = new Form($_REQUEST['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'], PATH_DYNAFORM, SYS_LANG, false);
}
$historyData=array();
$historyDataAux=array();
@@ -127,7 +129,7 @@ while ($aRow = $oDataset->getRow()) {
$count=0;
foreach($changedValues as $key =>$value){
if(($value!=NULL)&&(!is_array($value))){
if (isset($form->fields[$key])) {
if (isset($form) && isset($form->fields[$key])) {
$label = $form->fields[$key]->label . ' (' . $key . ')';
}
else {
@@ -143,7 +145,7 @@ while ($aRow = $oDataset->getRow()) {
foreach($value as $key1 =>$value1){
if(is_array($value1)){
foreach($value1 as $key2 =>$value2) {
if (isset($form->fields[$key]->fields[$key2])) {
if (isset($form) && isset($form->fields[$key]->fields[$key2])) {
$label = $form->fields[$key]->fields[$key2]->label . ' (' . $key . '[' . $key1 . '][' . $key2 . '])';
}
else {

12
workflow/engine/templates/groups/groupsMembers.js
View File

@@ -485,7 +485,17 @@ RemoveAllUsersAction = function(){
//Function DoSearch Available
DoSearchA = function(){
availableGrid.store.load({params: {textFilter: searchTextA.getValue()}});
numPage = parseInt(bbarpagingAvailable.getPageData().activePage);
availableGrid.store.load(
{params: {textFilter: searchTextA.getValue()},
callback: function (r, options, success) {
total = parseInt(bbarpagingAvailable.getPageData().total);
if (((numPage-1)*pageSize) >= total) {
numPage--;
}
availableGrid.getBottomToolbar().changePage(numPage);
}
});
};
//Function DoSearch Assigned

2
workflow/engine/templates/installer/main.js
View File

@@ -101,7 +101,7 @@ function finishInstallation()
}
function _redirect(_uri){
console.log('redirecting:: '+_uri);
//console.log('redirecting:: '+_uri);
window.location = _uri;
}

2
workflow/engine/templates/pmTables/list.js
View File

@@ -455,7 +455,7 @@ DeletePMTable = function() {
if (btn == "yes") {
Ext.Msg.show({
title : '',
msg : _('ID_REMOVING_SELECTD_TABLES'),
msg : _('ID_REMOVING_SELECTED_TABLES'),
wait:true,
waitConfig: {interval:500}
});

3
workflow/engine/templates/processes/main.js
View File

@@ -673,11 +673,10 @@ function exportProcess() {
success: function (response, opts) {
myMask.hide();
///////
var dataResponse = eval("(" + response.responseText + ")"); //json
var url = window.location.href;
window.open(url.substring(0, url.lastIndexOf("/") + 1) + dataResponse.FILENAME_LINK, "_blank");
window.location = url.substring(0, url.lastIndexOf("/") + 1) + dataResponse.FILENAME_LINK;
},
failure: function (response, opts) {

17
workflow/engine/templates/users/users.js
View File

@@ -343,7 +343,7 @@ Ext.onReady(function () {
});
var status = new Ext.data.SimpleStore({
fields: ["USR_STATUS", "status"],
fields: ["USR_STATUS_VALUE", "status"],
data: [["ACTIVE", _("ID_ACTIVE")], ["INACTIVE", _("ID_INACTIVE")], ["VACATION", _("ID_VACATION")]]
});
@@ -356,7 +356,7 @@ Ext.onReady(function () {
mode : 'local',
store : status,
displayField : 'status',
valueField : 'USR_STATUS',
valueField : 'USR_STATUS_VALUE',
width : 120,
typeAhead : true,
triggerAction : 'all',
@@ -672,6 +672,14 @@ Ext.onReady(function () {
mode : "local"
});
comboDefaultCasesMenuOption.disable();
comboDefaultMainMenuOption.on('select',function(cmb,record,index) {
comboDefaultCasesMenuOption.disable();
if (record.get('id') == 'PM_CASES') {
comboDefaultCasesMenuOption.enable();
}
},this);
var preferencesFields = new Ext.form.FieldSet({
title : _('ID_PREFERENCES'),
// for display or not a preferences FieldSet
@@ -1053,6 +1061,7 @@ function saveUser()
var confPass = frmDetails.getForm().findField('USR_CNF_PASS').getValue();
if (confPass === newPass) {
Ext.getCmp('USR_STATUS').setDisabled(readMode);
Ext.getCmp('frmDetails').getForm().submit({
url : 'usersAjax',
params : {
@@ -1160,7 +1169,7 @@ function loadUserData()
USR_POSITION : data.user.USR_POSITION,
USR_DUE_DATE : data.user.USR_DUE_DATE,
USR_STATUS : data.user.USR_STATUS
})
});
if (infoMode) {
Ext.getCmp("USR_FIRSTNAME2").setText(data.user.USR_FIRSTNAME);
@@ -1178,7 +1187,7 @@ function loadUserData()
Ext.getCmp("USR_POSITION2").setText(data.user.USR_POSITION);
Ext.getCmp("USR_REPLACED_BY2").setText(data.user.REPLACED_NAME);
Ext.getCmp("USR_DUE_DATE2").setText(data.user.USR_DUE_DATE);
Ext.getCmp("USR_STATUS2").setText(data.user.USR_STATUS);
Ext.getCmp("USR_STATUS2").setText(_('ID_' + data.user.USR_STATUS));
Ext.getCmp("USR_ROLE2").setText(data.user.USR_ROLE);
Ext.getCmp("PREF_DEFAULT_MAIN_MENU_OPTION2").setText(data.user.MENUSELECTED_NAME);