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

Second changes

Browse Source
This commit is contained in:
dante
2017-08-11 13:43:39 -04:00
parent 6af41fcd3a
commit 65007f7cef
18 changed files with 30 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/controllers/dashboard.php
View File

@@ -22,7 +22,7 @@ class Dashboard extends Controller
G::header( 'location: login/login' );
exit(0);
}
$this->pmDashlet = new PMDashlet();
$this->pmDashlet = new PmDashlet();
}
// Functions for the dashboards users module - Start
@@ -244,14 +244,14 @@ class Dashboard extends Controller
if ($data->DAS_INS_UID != '') {
$this->pmDashlet->setup( $data->DAS_INS_UID );
$this->setJSVar( 'dashletInstance', $this->pmDashlet->getDashletInstance() );
$this->setJSVar( 'additionalFields', PMDashlet::getAdditionalFields( get_class( $this->pmDashlet->getDashletObject() ) ) );
$this->setJSVar( 'additionalFields', PmDashlet::getAdditionalFields( get_class( $this->pmDashlet->getDashletObject() ) ) );
} else {
$dashletInstance = new stdclass();
$dashletInstance->DAS_UID = $dashlets[0][0];
$dashlet = new Dashlet();
$dashletFields = $dashlet->load( $dashletInstance->DAS_UID );
$this->setJSVar( 'dashletInstance', $dashletInstance );
$this->setJSVar( 'additionalFields', PMDashlet::getAdditionalFields( $dashletFields['DAS_CLASS'] ) );
$this->setJSVar( 'additionalFields', PmDashlet::getAdditionalFields( $dashletFields['DAS_CLASS'] ) );
}
G::RenderPage( 'publish', 'extJs' );
return null;
@@ -305,7 +305,7 @@ class Dashboard extends Controller
$dashlet = new Dashlet();
$dashletFields = $dashlet->load( $data->DAS_UID );
if (! is_null( $dashletFields )) {
$result->additionalFields = PMDashlet::getAdditionalFields( $dashletFields['DAS_CLASS'] );
$result->additionalFields = PmDashlet::getAdditionalFields( $dashletFields['DAS_CLASS'] );
} else {
throw new Exception( 'Dashlet "' . $data->DAS_UID . '" does not exist.' );
}

6
workflow/engine/controllers/pmGmail.php
View File

@@ -10,7 +10,7 @@ class pmGmail extends Controller
{
public function saveConfigPmGmail($httpData)
{
$pmGoogle = new PMGoogleApi();
$pmGoogle = new PmGoogleApi();
$result = new StdClass();
$result->success = true;
@@ -62,7 +62,7 @@ class pmGmail extends Controller
$this->setJSVar('__PMGMAIL_ERROR__', $_SESSION['__PMGMAIL_ERROR__']);
unset($_SESSION['__PMGMAIL_ERROR__']);
}
$pmGoogle = new PMGoogleApi();
$pmGoogle = new PmGoogleApi();
$accountEmail = $pmGoogle->getServiceAccountEmail();
$googleCertificate = $pmGoogle->getServiceAccountCertificate();
$statusGmail = $pmGoogle->getServiceGmailStatus();
@@ -98,7 +98,7 @@ class pmGmail extends Controller
*/
public function testConfigPmGmail($httpData)
{
$pmGoogle = new PMGoogleApi();
$pmGoogle = new PmGoogleApi();
$result = new stdClass();