BUG 11407 "No muestra el dashlet PM Table cuando se asigna..." SOLVED

- In ADMIN>Settings>Dashboards assignment does not respect
  the "Assign To" for groups and departments
- Solved problem, small improvement in validation
* Available from version ProcessMaker-2.5
This commit is contained in:
Victor Saisa Lopez
2013-05-02 10:13:43 -04:00
parent 46a246a6ff
commit b43760f9b1

View File

@@ -272,7 +272,7 @@ class PMDashlet extends DashletInstance implements DashletInterface
if (! isset( $dashletsInstances[$row['DAS_INS_UID']] )) { if (! isset( $dashletsInstances[$row['DAS_INS_UID']] )) {
$arrayField = unserialize( $row["DAS_INS_ADDITIONAL_PROPERTIES"] ); $arrayField = unserialize( $row["DAS_INS_ADDITIONAL_PROPERTIES"] );
if (!(self::verifyPluginDashlet($row['DAS_CLASS']))) { if (self::verifyPluginDashlet($row["DAS_CLASS"])) {
$row['DAS_XTEMPLATE'] = $this->getXTemplate( $row['DAS_CLASS'] ); $row['DAS_XTEMPLATE'] = $this->getXTemplate( $row['DAS_CLASS'] );
$row["DAS_TITLE"] = (isset( $arrayField["DAS_INS_TITLE"] ) && ! empty( $arrayField["DAS_INS_TITLE"] )) ? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"]; $row["DAS_TITLE"] = (isset( $arrayField["DAS_INS_TITLE"] ) && ! empty( $arrayField["DAS_INS_TITLE"] )) ? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"];
$row["DAS_TITLE"] = $row["DAS_TITLE"] . ((isset( $arrayField["DAS_INS_SUBTITLE"] ) && ! empty( $arrayField["DAS_INS_SUBTITLE"] )) ? str_replace( "@@USR_USERNAME", $_SESSION["USR_USERNAME"], $arrayField["DAS_INS_SUBTITLE"] ) : null); $row["DAS_TITLE"] = $row["DAS_TITLE"] . ((isset( $arrayField["DAS_INS_SUBTITLE"] ) && ! empty( $arrayField["DAS_INS_SUBTITLE"] )) ? str_replace( "@@USR_USERNAME", $_SESSION["USR_USERNAME"], $arrayField["DAS_INS_SUBTITLE"] ) : null);
@@ -303,7 +303,7 @@ class PMDashlet extends DashletInstance implements DashletInterface
if (! isset( $dashletsInstances[$row['DAS_INS_UID']] )) { if (! isset( $dashletsInstances[$row['DAS_INS_UID']] )) {
$arrayField = unserialize( $row["DAS_INS_ADDITIONAL_PROPERTIES"] ); $arrayField = unserialize( $row["DAS_INS_ADDITIONAL_PROPERTIES"] );
if (!(self::verifyPluginDashlet($row['DAS_CLASS']))) { if (self::verifyPluginDashlet($row["DAS_CLASS"])) {
$row['DAS_XTEMPLATE'] = $this->getXTemplate( $row['DAS_CLASS'] ); $row['DAS_XTEMPLATE'] = $this->getXTemplate( $row['DAS_CLASS'] );
$row["DAS_TITLE"] = (isset( $arrayField["DAS_INS_TITLE"] ) && ! empty( $arrayField["DAS_INS_TITLE"] )) ? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"]; $row["DAS_TITLE"] = (isset( $arrayField["DAS_INS_TITLE"] ) && ! empty( $arrayField["DAS_INS_TITLE"] )) ? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"];
$row["DAS_TITLE"] = $row["DAS_TITLE"] . ((isset( $arrayField["DAS_INS_SUBTITLE"] ) && ! empty( $arrayField["DAS_INS_SUBTITLE"] )) ? str_replace( "@@USR_USERNAME", $_SESSION["USR_USERNAME"], $arrayField["DAS_INS_SUBTITLE"] ) : null); $row["DAS_TITLE"] = $row["DAS_TITLE"] . ((isset( $arrayField["DAS_INS_SUBTITLE"] ) && ! empty( $arrayField["DAS_INS_SUBTITLE"] )) ? str_replace( "@@USR_USERNAME", $_SESSION["USR_USERNAME"], $arrayField["DAS_INS_SUBTITLE"] ) : null);