Progress 17 for the dashboards
This commit is contained in:
@@ -133,6 +133,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
|
||||
$criteria = new Criteria('workflow');
|
||||
$criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID);
|
||||
$criteria->addSelectColumn(DashletPeer::DAS_TITLE);
|
||||
$criteria->addSelectColumn(DashletInstancePeer::DAS_INS_CONTEXT_TIME);
|
||||
$criteria->add(DashletInstancePeer::DAS_INS_OWNER_TYPE, 'DEPARTMENT');
|
||||
$criteria->add(DashletInstancePeer::DAS_INS_OWNER_UID, $depUid);
|
||||
$dataset = DashletInstancePeer::doSelectRS($criteria);
|
||||
@@ -140,6 +141,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
|
||||
$dataset->next();
|
||||
while ($row = $dataset->getRow()) {
|
||||
if (!isset($dashletsInstances[$row['DAS_INS_UID']])) {
|
||||
$row['DAS_TITLE'] .= ' (' . $row['DAS_INS_CONTEXT_TIME'] . ')';
|
||||
$dashletsInstances[$row['DAS_INS_UID']] = $row;
|
||||
}
|
||||
$dataset->next();
|
||||
|
||||
@@ -34,6 +34,9 @@ class DashletInstance extends BaseDashletInstance {
|
||||
$connection = Propel::getConnection(DashletInstancePeer::DATABASE_NAME);
|
||||
try {
|
||||
if (!isset($data['DAS_INS_UID'])) {
|
||||
$data['DAS_INS_UID'] = '';
|
||||
}
|
||||
if ($data['DAS_INS_UID'] == '') {
|
||||
$data['DAS_INS_UID'] = G::generateUniqueID();
|
||||
$data['DAS_INS_CREATE_DATE'] = date('Y-m-d H:i:s');
|
||||
$dashletInstance = new DashletInstance();
|
||||
|
||||
@@ -197,7 +197,7 @@ Ext.onReady(function(){
|
||||
editable: false,
|
||||
listeners:{
|
||||
select: function(c,d,i){
|
||||
UpdatePageConfig(d.data['size']);
|
||||
//UpdatePageConfig(d.data['size']);
|
||||
bbarpaging.pageSize = parseInt(d.data['size']);
|
||||
bbarpaging.moveFirst();
|
||||
}
|
||||
@@ -300,6 +300,14 @@ gridByDefault = function(){
|
||||
infoGrid.store.load({params: {textFilter: searchText.getValue()}});
|
||||
};*/
|
||||
|
||||
//Update Page Size Configuration
|
||||
/*updatePageConfig = function(pageSize) {
|
||||
Ext.Ajax.request({
|
||||
url: 'updatePageConfig',
|
||||
params: {size: pageSize}
|
||||
});
|
||||
};*/
|
||||
|
||||
//New Dashlet Instance Action
|
||||
newDashletInstance = function() {
|
||||
location.href = 'dashletInstanceForm';
|
||||
|
||||
Reference in New Issue
Block a user