From 81f8ffd2f7e4bad1b6ea8ca865aa82393306716c Mon Sep 17 00:00:00 2001 From: dheeyi Date: Wed, 27 May 2015 17:14:44 -0400 Subject: [PATCH] =?UTF-8?q?PM-1626=200016797:=20REST=20endpoint=20/api/1.0?= =?UTF-8?q?/{workspace}/users=20should=20return=20the=20calendar=20and=20p?= =?UTF-8?q?hoto=20of=20the=20user.=20Causa=20:=20Definida=20asi=20el=20end?= =?UTF-8?q?point=20USERS.=20Soluci=C3=B3Agregar=20la=20informaci=C3=B3ue?= =?UTF-8?q?=20se=20pide=20(calendar=5Fuid,=20calendar=5Fname=20y=20el=20pa?= =?UTF-8?q?th=20de=20la=20fotografia).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/src/ProcessMaker/BusinessModel/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/User.php b/workflow/engine/src/ProcessMaker/BusinessModel/User.php index 632ba8ca2..ba9730fe7 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/User.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/User.php @@ -335,7 +335,7 @@ class User try { //Get Calendar $calendar = new \Calendar(); - $calendarInfo = $calendar->getCalendarFor( $record["USR_UID"], $record["USR_UID"], $record["USR_UID"] ); + $calendarInfo = $calendar->getCalendarFor( $record["USR_UID"], "", "" ); $aFields["USR_CALENDAR_UID"] = ($calendarInfo["CALENDAR_APPLIED"] != "DEFAULT") ? $calendarInfo["CALENDAR_UID"] : ""; $aFields["USR_CALENDAR"] = ($aFields["USR_CALENDAR_UID"] != "") ? $calendar->calendarName( $aFields["USR_CALENDAR_UID"] ) : $aFields["USR_CALENDAR_UID"];