From 0564efebbe39f09201976d3c293a39e19ebbf25b Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 25 Jul 2012 10:44:00 -0400 Subject: [PATCH] BUG 8853 Adding the cases from "unassigned Folder" to simplified... SOLVED - No had this option. - Was added the functionality Unassigned Inbox. --- workflow/engine/controllers/home.php | 5 +- workflow/engine/menus/simplified.php | 12 +++- .../methods/cases/cases_CatchExecute.php | 68 ++++++++++-------- .../images/simplified/folder-grey3.png | Bin 0 -> 1710 bytes 4 files changed, 52 insertions(+), 33 deletions(-) create mode 100644 workflow/public_html/images/simplified/folder-grey3.png diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php index 3e9f932f2..6e6b035a6 100755 --- a/workflow/engine/controllers/home.php +++ b/workflow/engine/controllers/home.php @@ -58,6 +58,8 @@ class Home extends Controller $this->setVar('usr', $data['u']); $this->setVar('pwd', $data['p']); $this->setVar('skin', $skin); + echo "

Este es el template

"; + echo $template; $this->setView("home/$template"); @@ -193,6 +195,7 @@ class Home extends Controller switch ($httpData->t) { case 'todo' : $title = 'My Inbox'; break; case 'draft' : $title = 'My Drafts'; break; + case 'unassigned' : $title = 'Unassigned Inbox'; break; default: $title = ucwords($httpData->t); } @@ -209,7 +212,7 @@ class Home extends Controller $this->setVar('appListStart', $this->appListLimit); $this->setVar('appListLimit', 10); $this->setVar('listType', $httpData->t); - +//print_r($this->render()); $this->render(); } diff --git a/workflow/engine/menus/simplified.php b/workflow/engine/menus/simplified.php index 6b7e47297..3b2b64a91 100644 --- a/workflow/engine/menus/simplified.php +++ b/workflow/engine/menus/simplified.php @@ -2,9 +2,15 @@ global $G_TMP_MENU; global $RBAC; -$G_TMP_MENU->AddIdRawOption("S_HOME", "home/appList?t=todo", G::LoadTranslation("ID_HOME"), "/images/simplified/in-set-grey.png", null, null, null); +$G_TMP_MENU->AddIdRawOption("S_HOME", "home/appList?t=todo", G::LoadTranslation("ID_HOME"), + "/images/simplified/in-set-grey.png", null, null, null); if ($RBAC->userCanAccess("PM_CASES") == 1) { - $G_TMP_MENU->AddIdRawOption("S_DRAFT", "home/appList?t=draft", G::LoadTranslation("ID_DRAFT"), "/images/simplified/folder-grey.png", null, null, null); - $G_TMP_MENU->AddIdRawOption("S_NEW_CASE", "#", G::LoadTranslation("ID_NEW_CASE"), "/images/simplified/plus-set-grey.png", null, null, null); + $G_TMP_MENU->AddIdRawOption("S_DRAFT", "home/appList?t=draft", G::LoadTranslation("ID_DRAFT"), + "/images/simplified/folder-grey.png", null, null, null); + $G_TMP_MENU->AddIdRawOption("S_DRAFT", "home/appList?t=unassigned", G::LoadTranslation("ID_UNASSIGNED"), + "/images/simplified/folder-grey3.png", null, null, null); + $G_TMP_MENU->AddIdRawOption("S_NEW_CASE", "#", G::LoadTranslation("ID_NEW_CASE"), + "/images/simplified/plus-set-grey.png", null, null, null); } + diff --git a/workflow/engine/methods/cases/cases_CatchExecute.php b/workflow/engine/methods/cases/cases_CatchExecute.php index 2553c59f7..142ab5e73 100755 --- a/workflow/engine/methods/cases/cases_CatchExecute.php +++ b/workflow/engine/methods/cases/cases_CatchExecute.php @@ -27,47 +27,57 @@ /* Permissions */ switch ($RBAC->userCanAccess('PM_CASES')) { - case -2: - G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels'); - G::header('location: ../login/login'); - die; - break; - case -1: - G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels'); - G::header('location: ../login/login'); - die; - break; + case -2: + G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels'); + G::header('location: ../login/login'); + die; + break; + case -1: + G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels'); + G::header('location: ../login/login'); + die; + break; } - if ( isset ( $_POST['form']['BTN_CANCEL'] ) ) { +if (isset($_POST['form']['BTN_CANCEL'])) { header ( "Location: ../cases/main"); die; - } +} - /* Includes */ - G::LoadClass('case'); +/* Includes */ +G::LoadClass('case'); - $oCase = new Cases(); - $sAppUid = $_SESSION['APPLICATION']; - $iDelIndex = $_SESSION['INDEX']; +$oCase = new Cases(); +$sAppUid = $_SESSION['APPLICATION']; +$iDelIndex = $_SESSION['INDEX']; - $oAppDelegation = new AppDelegation(); - $aDelegation = $oAppDelegation->load($sAppUid, $iDelIndex); - - //if there are no user in the delegation row, this case is still in selfservice - if ( $aDelegation['USR_UID'] == "" ) { +$oAppDelegation = new AppDelegation(); +$aDelegation = $oAppDelegation->load($sAppUid, $iDelIndex); + +//if there are no user in the delegation row, this case is still in selfservice +if ( $aDelegation['USR_UID'] == "" ) { $oCase->setCatchUser( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'] ); - } - else { +} else { G::SendMessageText(G::LoadTranslation('ID_CASE_ALREADY_DERIVATED'), 'error'); - } +} - die(''); + } else { + window.location = "../cases/cases_Open?APP_UID=' . $_SESSION['APPLICATION'] . '&DEL_INDEX=' . + $_SESSION['INDEX'] . '&action=unassigned"; + } + ' +); + diff --git a/workflow/public_html/images/simplified/folder-grey3.png b/workflow/public_html/images/simplified/folder-grey3.png new file mode 100644 index 0000000000000000000000000000000000000000..185f70c42b069a5e658086126be882670a0776e9 GIT binary patch literal 1710 zcmaJ?Yfuws6irB=lrd=0BH9GkP!*LtHj#wHL?8*z5*|qqR49ba0wE?Fl7)m=rvbF1 z6|h2;s;E>)aG<`5GGJ7&KA>VNf{2x8rz$NX#-g>>N4r75{wUp<-S08yoO|zg&o{d@ zHad*tHs1}0!;vDwB{FOTu=fL37wk)EDc*w(^U#n)RF0&hCZz$!1*?!W7>Lj+Ghi94 zROMxV4-0TO0-#nTqKVQdK7?rLN(Y8+*6J}f4krjS>y?lOMu9XqL#-21AK99yfLbM_ zCiqL4QoR_?REJv(u-p=@fGiq_r=kX~0t9A0CZL5;C1BRB*BSX{A$44rkIfz13@R`V zK{Z0^o1_w@v49vcz<@uUNrRXiCcpvdAbSOu%k=|TOpwW7vKSzX26Fjq7N5xkCLSsl z&7ex>%Os%_v9Ohpnu(%%K7(O0ndl}q9Wi7uKpv0h&|tA>7=mWZ)1gW;O=t9(RFJ?% z$e`AvYD5P(6qRX64l1N#nZ7AOtDln987GbjJ1~Y>sb_$6rlX`upj7(*P_1?fZA4}8 z+kF31*r>?U!wea0L~;xe*0^*ZM<_jCY=D(0Vo)H+`pHv_%|uYdn2G2CvD_a>Q0r8P z$vBRdO8F5wBdXLvaD+ri#rSl!TE*vZK`x6K%93z6JP-^4132su3CI+)L8eH=3E)n0 zB?y$Gg>~p8SM`?5o|fw{f>w`3mcRyeF02YQAX;F&V7_|#T$t19O>kAy=K@a4WnjrL z9ButqnMGYro|Rhwug0?*A1AdD-L~KgWZ)6BP78J^PNlODdF-sa?AC7yvu=_ z#ix7|6koJe(Kgx_QG;7u({^~tEi){wLzTdmEd>@g%eHB#ioAyziVZ z=|>tH*W5Gk{Ml^iua6R@~j!chqz4+~p&8dV0Eg zdn+Oj%StFi2I347X{r0Qe80A3p9Tg0hVF5yc-`8%W%%L4cnXCAuXGm$?~eM+siKKA zb7pPkiW;ZoUD{TAI&Pk)95*HU<`6atn=hQGP zp(@AL9KX_7RbBnOHs1Y0sJ9oHjM{eY3rw9y#6N?Z70n$TrEV^T_ZPZu7FnJ-n~CmD zqc*5=n{CdfHJ(v|*oD?wwmuu5gx}sMhM#_NzO<`}u%sCt9GhR{f6&ibw!yX1#;|5| zq~r?c6;uzB0v7dyF{0z-pbbkKdh+bMG_!Urx$ta{v-xgwialr@tw*gVjJ(sNx>xTS zpcqr${W<^oVA-wh`9qeHf{T0kB%#3W{IdP8p(iZ-XklHd_Xt5i{9V8wzL!tWX6#)s za-$#YVGr)w1bv+AbfC;{zo4*4P`TjZu`3a#@NYhHKB6f4^M=@tKifS_+}ww6DJGiD zR$X!1>kMkY%UN|2G37#>y)#+UoU6a&OZ2WLLzWn~=;->Na_kZh`=RAwkq>L;)SS7A zKl7OGRo=C9>&A4-i{#R;?%Pre$*~@q)!&^OdEUL&!}D~pc1cOe9SDMIjvoDC`CLw4K+38E30T*c?T%V|YxUn5 cPhzZi9NHKY)!=-4$ngh>2#J;)6QvgX10chbSO5S3 literal 0 HcmV?d00001