[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] ged inc/class.ged_dm.inc.php inc/hook_home.inc....
|
From: |
Pascal Vilarem |
|
Subject: |
[Phpgroupware-cvs] ged inc/class.ged_dm.inc.php inc/hook_home.inc.... |
|
Date: |
Tue, 17 Jul 2007 11:13:06 +0000 |
CVSROOT: /sources/phpgroupware
Module name: ged
Changes by: Pascal Vilarem <maat> 07/07/17 11:13:06
Modified files:
inc : class.ged_dm.inc.php hook_home.inc.php
class.ged_ui.inc.php
templates/base : home.tpl stats.tpl
setup : tables_update.inc.php setup.inc.php
Log message:
swapped accept<->approve and refuse<->reject to ensure workflow is
compliant with quality standards.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_dm.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/ged/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/home.tpl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/stats.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ged/setup/tables_update.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ged/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
Patches:
Index: inc/class.ged_dm.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_dm.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- inc/class.ged_dm.inc.php 16 Jul 2007 13:32:29 -0000 1.33
+++ inc/class.ged_dm.inc.php 17 Jul 2007 11:13:05 -0000 1.34
@@ -345,12 +345,12 @@
// MEMO gestion des numeros de versions
-
$current_or_alert_or_rejected_version=$this->get_current_or_alert_or_rejected_version($new_version['element_id']);
- $major=$current_or_alert_or_rejected_version['major'];
- $minor=$current_or_alert_or_rejected_version['minor'];
+
$current_or_alert_or_refused_version=$this->get_current_or_alert_or_refused_version($new_version['element_id']);
+ $major=$current_or_alert_or_refused_version['major'];
+ $minor=$current_or_alert_or_refused_version['minor'];
$last_version=$this->get_last_version($new_version['element_id']);
- if ($last_version['status'] == 'current' ||
$last_version['status'] == 'rejected' || $last_version['status'] == 'alert' )
+ if ($last_version['status'] == 'current' ||
$last_version['status'] == 'refused' || $last_version['status'] == 'alert' )
{
if ($new_version['type']=='major')
{
@@ -433,7 +433,7 @@
// MEMO gestion des numeros de versions
-
$cur_version=$this->get_current_or_alert_or_rejected_version($amended_version['element_id']);
+
$cur_version=$this->get_current_or_alert_or_refused_version($amended_version['element_id']);
$me_version=$this->get_version_info($amended_version['version_id']);
if ( $me_version['status']=='working' )
@@ -842,18 +842,18 @@
}
- function get_current_or_alert_or_rejected_version($element_id)
+ function get_current_or_alert_or_refused_version($element_id)
{
- if ( $this->debug('get_current_or_alert_or_rejected_version') )
- print ( "get_current_or_alert_or_rejected_version:
entering with element_id=".$element_id."<br>\n");
+ if ( $this->debug('get_current_or_alert_or_refused_version') )
+ print ( "get_current_or_alert_or_refused_version:
entering with element_id=".$element_id."<br>\n");
$sql="SELECT * FROM ".$this->tables['versions']." ";
$sql.="WHERE element_id=".$element_id." ";
- $sql.="AND ( status='current' OR status='alert' OR
status='rejected' ) ";
+ $sql.="AND ( status='current' OR status='alert' OR
status='refused' ) ";
$sql.="ORDER BY version_id DESC LIMIT 1";
- if ( $this->debug('get_current_or_alert_or_rejected_version') )
- print ( "get_current_or_alert_or_rejected_version:
".$sql."<br>\n");
+ if ( $this->debug('get_current_or_alert_or_refused_version') )
+ print ( "get_current_or_alert_or_refused_version:
".$sql."<br>\n");
//print ("<pre>");
//print_r($this->db->metadata( $this->tables['versions'] ));
@@ -1915,7 +1915,7 @@
// Say file is OK
// User must have approval rights on this document
- function approve_file ( $element_id )
+ function accept_file ( $element_id )
{
$current_or_alert_version=$this->get_current_or_alert_version($element_id);
$working_or_pending_version=$this->get_working_or_pending_version($element_id);
@@ -1931,7 +1931,7 @@
if
($current_or_alert_version['version_id'] )
{
$sql="UPDATE ged_versions set
status='obsolete' WHERE version_id=".$current_or_alert_version['version_id']."
";
- $sql.="AND status !=
'rejected'";
+ $sql.="AND status !=
'refused'";
$this->db->query($sql,
__LINE__, __FILE__);
$this->db->unlock();
@@ -1951,7 +1951,7 @@
$this->db->query($sql, __LINE__, __FILE__);
$this->db->unlock();
- $this->store_history ('approved', 'approved',
$working_or_pending_version['version_id']);
+ $this->store_history ('accepted', 'accepted',
$working_or_pending_version['version_id']);
}
}
}
@@ -1970,7 +1970,7 @@
// Say file is not valid
- function refuse_file ( $element_id, $reason="Default reason" )
+ function reject_file ( $element_id, $reason="Default reason" )
{
$pending_version=$this->get_pending_for_internal_review($element_id);
@@ -1985,7 +1985,7 @@
$this->db->query($sql, __LINE__, __FILE__);
$this->db->unlock();
- $this->store_history ('refused', 'refused',
$pending_version['version_id']);
+ $this->store_history ('rejected', 'rejected',
$pending_version['version_id']);
}
}
}
@@ -1994,7 +1994,7 @@
// A new version must be worked on and delivered
// User must have approval rights on this document
- function reject_file ( $element_id, $reason="Default reason" )
+ function refuse_file ( $element_id, $reason="Default reason" )
{
$pending_version=$this->get_pending_for_approval($element_id);
@@ -2005,11 +2005,11 @@
{
// Set "pending_for_internal_review" status
// TODO : Add submission date
- $sql="UPDATE ged_versions set status='rejected'
WHERE version_id=".$pending_version['version_id'];
+ $sql="UPDATE ged_versions set status='refused'
WHERE version_id=".$pending_version['version_id'];
$this->db->query($sql, __LINE__, __FILE__);
$this->db->unlock();
- $this->store_history ('rejected', 'rejected',
$pending_version['version_id']);
+ $this->store_history ('refused', 'refused',
$pending_version['version_id']);
}
}
}
@@ -2017,7 +2017,7 @@
// Submit file to customer for approval
// After a contractual timeout the file is
- // considered approved
+ // considered accepted
function deliver_file ( $element_id )
{
$pending_version=$this->get_ready_for_delivery($element_id);
@@ -2061,7 +2061,7 @@
}
}
- function accept_file ( $element_id )
+ function approve_file ( $element_id )
{
$pending_version=$this->get_pending_for_internal_review($element_id);
@@ -2083,7 +2083,7 @@
$this->db->query($sql, __LINE__, __FILE__);
$this->db->unlock();
- $this->store_history ('accepted', 'accepted',
$pending_version['version_id']);
+ $this->store_history ('approved', 'approved',
$pending_version['version_id']);
}
}
}
@@ -2569,14 +2569,14 @@
}
- function list_rejected_documents ($element_id=null)
+ function list_refused_documents ($element_id=null)
{
$sql="SELECT ged_elements.*, ged_current_version.*,
max(ged_last_version.version_id) as last_version_id ";
$sql.="FROM ( ged_elements ";
$sql.="INNER JOIN ged_versions as ged_current_version ";
$sql.="ON
ged_elements.element_id=ged_current_version.element_id ";
- $sql.="AND ( ged_current_version.status='rejected' )) ";
+ $sql.="AND ( ged_current_version.status='refused' )) ";
$sql.="INNER JOIN ged_versions as ged_last_version ";
$sql.="ON ged_elements.element_id=ged_last_version.element_id ";
@@ -2755,7 +2755,7 @@
$version_id=$this->db->f('version_id');
$version_status=$this->db->f('status');
- if ( $this->can_write($element_id) || ( $version_status
== "pending_for_approval" || $version_status == "current" || $version_status ==
"rejected") && $this->can_read($element_id) )
+ if ( $this->can_write($element_id) || ( $version_status
== "pending_for_approval" || $version_status == "current" || $version_status ==
"refused") && $this->can_read($element_id) )
{
$docs[$i]['element_id']=$element_id;
$docs[$i]['version_id']=$version_id;
Index: inc/hook_home.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/hook_home.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- inc/hook_home.inc.php 16 Jul 2007 09:57:49 -0000 1.9
+++ inc/hook_home.inc.php 17 Jul 2007 11:13:06 -0000 1.10
@@ -84,7 +84,7 @@
$template->set_block('ged_projects', 'working_docs_list',
'working_docs_list_handle');
$template->set_block('ged_projects', 'pending_docs_list',
'pending_docs_list_handle');
$template->set_block('ged_projects', 'alert_docs_list',
'alert_docs_list_handle');
- $template->set_block('ged_projects', 'rejected_docs_list',
'rejected_docs_list_handle');
+ $template->set_block('ged_projects', 'refused_docs_list',
'refused_docs_list_handle');
foreach ( $myprojects as $my_element_id => $myproject )
@@ -99,7 +99,7 @@
$template->set_var('working_docs_list_handle', "" );
$template->set_var('pending_docs_list_handle', "" );
$template->set_var('alert_docs_list_handle', "" );
- $template->set_var('rejected_docs_list_handle', "" );
+ $template->set_var('refused_docs_list_handle', "" );
$file_odd_even='odd';
if ( is_array($new_docs))
@@ -203,29 +203,29 @@
}
}
-
$rejected_docs=$ged_dm->list_rejected_documents($my_element_id);
+
$refused_docs=$ged_dm->list_refused_documents($my_element_id);
$file_odd_even='odd';
- if ( is_array($rejected_docs))
+ if ( is_array($refused_docs))
{
- foreach ($rejected_docs as $rejected_doc )
+ foreach ($refused_docs as $refused_doc )
{
if ( $file_odd_even=='odd' )
$file_odd_even='even';
else
$file_odd_even='odd';
- $template->set_var('status_image',
$GLOBALS['phpgw']->common->image('ged', $rejected_doc['status']."-16"));
- $template->set_var('version',
$rejected_doc['major'].".".$rejected_doc['minor']);
- $template->set_var('doc_name',
$rejected_doc['name']);
- $template->set_var('doc_reference',
$rejected_doc['reference']);
+ $template->set_var('status_image',
$GLOBALS['phpgw']->common->image('ged', $refused_doc['status']."-16"));
+ $template->set_var('version',
$refused_doc['major'].".".$refused_doc['minor']);
+ $template->set_var('doc_name',
$refused_doc['name']);
+ $template->set_var('doc_reference',
$refused_doc['reference']);
$link_data=null;
$link_data['menuaction']='ged.ged_ui.browse';
-
$link_data['focused_id']=$rejected_doc['element_id'];
+
$link_data['focused_id']=$refused_doc['element_id'];
$template->set_var('doc_link',
$GLOBALS['phpgw']->link('/index.php', $link_data));
-
$template->fp('rejected_docs_list_handle', 'rejected_docs_list', True);
+
$template->fp('refused_docs_list_handle', 'refused_docs_list', True);
}
}
$template->fp('ged_projects_handle', 'ged_projects',
True);
Index: inc/class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- inc/class.ged_ui.inc.php 16 Jul 2007 13:32:30 -0000 1.35
+++ inc/class.ged_ui.inc.php 17 Jul 2007 11:13:06 -0000 1.36
@@ -26,7 +26,7 @@
var $debug=1;
var $browser;
- var $public_functions=array('browse'=>true, 'add_file'=>true,
'add_folder'=>true, 'update_file'=>true, 'update_folder'=>true,
'delete_folder'=>true, 'download'=>true, 'package_download' => true,
'view'=>true, 'update_file'=>true, 'delete_file'=>true, 'change_acl'=>true,
'approve_file'=>true, 'submit_file'=> true, 'accept_file'=> true,
'refuse_file'=> true, 'deliver_file'=> true, 'reject_file'=> true, 'search' =>
true, 'stats'=> true );
+ var $public_functions=array('browse'=>true, 'add_file'=>true,
'add_folder'=>true, 'update_file'=>true, 'update_folder'=>true,
'delete_folder'=>true, 'download'=>true, 'package_download' => true,
'view'=>true, 'update_file'=>true, 'delete_file'=>true, 'change_acl'=>true,
'accept_file'=>true, 'submit_file'=> true, 'approve_file'=> true,
'reject_file'=> true, 'deliver_file'=> true, 'refuse_file'=> true, 'search' =>
true, 'stats'=> true );
var $icons;
@@ -346,7 +346,7 @@
$theversion=$this->ged_dm->get_version_info($version_id);
else
{
-
$theversion=$this->ged_dm->get_current_or_alert_or_rejected_version($element_id);
+
$theversion=$this->ged_dm->get_current_or_alert_or_refused_version($element_id);
$version_id=$theversion['version_id'];
}
@@ -550,11 +550,11 @@
$current_version=$this->ged_dm->get_version_info($version_id);
if (
$current_version['element_id']!=$element_id)
-
$current_version=$this->ged_dm->get_current_or_alert_or_rejected_version($element_id);
+
$current_version=$this->ged_dm->get_current_or_alert_or_refused_version($element_id);
}
else
-
$current_version=$this->ged_dm->get_current_or_alert_or_rejected_version($element_id);
+
$current_version=$this->ged_dm->get_current_or_alert_or_refused_version($element_id);
if ( $current_version['element_id']!=$element_id)
$current_version=$this->ged_dm->get_last_version($element_id);
@@ -952,7 +952,7 @@
$this->t->set_var('lang_add_file', '');
// TODO if acl write DONE
- if ( $this->ged_dm->can_write($focused_id) && (
$last_version['status'] == 'working' || $last_version['status'] == 'current' ||
$last_version['status'] == 'rejected' || $last_version['status'] == 'alert' ) )
+ if ( $this->ged_dm->can_write($focused_id) && (
$last_version['status'] == 'working' || $last_version['status'] == 'current' ||
$last_version['status'] == 'refused' || $last_version['status'] == 'alert' ) )
{
$link_data=null;
$link_data['menuaction']='ged.ged_ui.update_file';
@@ -978,8 +978,8 @@
$link_data=null;
$link_data['menuaction']='ged.ged_ui.submit_file';
$link_data['element_id']=$focused_id;
-
$approve_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
- $this->t->set_var('submit_file', "<a
href=\"".$approve_file_url."\">".lang('Submit file')."</a>");
+
$accept_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
+ $this->t->set_var('submit_file', "<a
href=\"".$accept_file_url."\">".lang('Submit file')."</a>");
}
@@ -988,25 +988,25 @@
if ( $this->ged_dm->admin &&
($last_version['status'] == 'working' || $last_version['status'] ==
'pending_for_technical_review' || $last_version['status'] ==
'pending_for_quality_review' || $last_version['status'] ==
'pending_for_approval' ) )
{
$link_data=null;
-
$link_data['menuaction']='ged.ged_ui.approve_file';
+
$link_data['menuaction']='ged.ged_ui.accept_file';
$link_data['element_id']=$focused_id;
-
$approve_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
- $this->t->set_var('approve_file', "<a
href=\"".$approve_file_url."\">".lang('Approve file')."</a>");
+
$accept_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
+ $this->t->set_var('accept_file', "<a
href=\"".$accept_file_url."\">".lang('accept file')."</a>");
}
if ( $this->ged_dm->admin && (
$last_version['status'] == 'pending_for_technical_review' ||
$last_version['status'] == 'pending_for_quality_review' ) )
{
$link_data=null;
-
$link_data['menuaction']='ged.ged_ui.accept_file';
+
$link_data['menuaction']='ged.ged_ui.approve_file';
$link_data['element_id']=$focused_id;
-
$accept_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
- $this->t->set_var('accept_file', "<a
href=\"".$accept_file_url."\">".lang('Accept file')."</a>");
+
$approve_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
+ $this->t->set_var('approve_file', "<a
href=\"".$approve_file_url."\">".lang('approve file')."</a>");
$link_data=null;
-
$link_data['menuaction']='ged.ged_ui.refuse_file';
+
$link_data['menuaction']='ged.ged_ui.reject_file';
$link_data['element_id']=$focused_id;
-
$refuse_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
- $this->t->set_var('refuse_file', "<a
href=\"".$refuse_file_url."\">".lang('Refuse file')."</a>");
+
$reject_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
+ $this->t->set_var('reject_file', "<a
href=\"".$reject_file_url."\">".lang('reject file')."</a>");
}
if ( $this->ged_dm->admin &&
$last_version['status'] == 'ready_for_delivery' )
@@ -1014,17 +1014,17 @@
$link_data=null;
$link_data['menuaction']='ged.ged_ui.deliver_file';
$link_data['element_id']=$focused_id;
-
$accept_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
- $this->t->set_var('deliver_file', "<a
href=\"".$accept_file_url."\">".lang('Deliver file')."</a>");
+
$approve_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
+ $this->t->set_var('deliver_file', "<a
href=\"".$approve_file_url."\">".lang('Deliver file')."</a>");
}
if ( $this->ged_dm->admin &&
$last_version['status'] == 'pending_for_approval' )
{
$link_data=null;
-
$link_data['menuaction']='ged.ged_ui.reject_file';
+
$link_data['menuaction']='ged.ged_ui.refuse_file';
$link_data['element_id']=$focused_id;
-
$accept_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
- $this->t->set_var('reject_file', "<a
href=\"".$accept_file_url."\">".lang('Reject file')."</a>");
+
$approve_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
+ $this->t->set_var('refuse_file', "<a
href=\"".$approve_file_url."\">".lang('refuse file')."</a>");
}
@@ -1076,7 +1076,7 @@
$link_data['menuaction']='ged.ged_ui.change_acl';
$link_data['element_id']=$focused_id;
$update_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
- $this->t->set_var('approve_file', "<a
href=\"".$update_file_url."\">".lang('Change ACL')."</a>");
+ $this->t->set_var('accept_file', "<a
href=\"".$update_file_url."\">".lang('Change ACL')."</a>");
}
// TODO : droit specifique de delete ?
@@ -1517,7 +1517,7 @@
// NIARF
if ( array_key_exists('status', $version_relation) )
{
- if ( $version_relation['status']=='obsolete' ||
$version_relation['status']=='rejected' )
+ if ( $version_relation['status']=='obsolete' ||
$version_relation['status']=='refused' )
{
// print ( 'new version :
'.$version_relation['version_id']."<br/>\n");
@@ -2168,11 +2168,11 @@
}
- function approve_file()
+ function accept_file()
{
$element_id=get_var('element_id', array('GET', 'POST'));
- $this->ged_dm->approve_file ( $element_id );
+ $this->ged_dm->accept_file ( $element_id );
$link_data=null;
$link_data['menuaction']='ged.ged_ui.browse';
@@ -2194,11 +2194,11 @@
$GLOBALS['phpgw']->redirect_link('/index.php', $link_data);
}
- function refuse_file()
+ function reject_file()
{
$element_id=get_var('element_id', array('GET', 'POST'));
- $this->ged_dm->refuse_file ( $element_id );
+ $this->ged_dm->reject_file ( $element_id );
$link_data=null;
$link_data['menuaction']='ged.ged_ui.browse';
@@ -2207,11 +2207,11 @@
$GLOBALS['phpgw']->redirect_link('/index.php', $link_data);
}
- function accept_file()
+ function approve_file()
{
$element_id=get_var('element_id', array('GET', 'POST'));
- $this->ged_dm->accept_file ( $element_id );
+ $this->ged_dm->approve_file ( $element_id );
$link_data=null;
$link_data['menuaction']='ged.ged_ui.browse';
@@ -2233,11 +2233,11 @@
$GLOBALS['phpgw']->redirect_link('/index.php', $link_data);
}
- function reject_file()
+ function refuse_file()
{
$element_id=get_var('element_id', array('GET', 'POST'));
- $this->ged_dm->reject_file ( $element_id );
+ $this->ged_dm->refuse_file ( $element_id );
$link_data=null;
$link_data['menuaction']='ged.ged_ui.browse';
@@ -2347,8 +2347,8 @@
$this->t->set_block('stats_tpl', 'ged_projects',
'ged_projects_handle');
$this->t->set_block('ged_projects', 'delivered_block',
'delivered_block_handle');
- $this->t->set_block('ged_projects', 'approved_block',
'approved_block_handle');
- $this->t->set_block('ged_projects', 'rejected_block',
'rejected_block_handle');
+ $this->t->set_block('ged_projects', 'accepted_block',
'accepted_block_handle');
+ $this->t->set_block('ged_projects', 'refused_block',
'refused_block_handle');
$link_data=null;
$link_data['menuaction']='ged.ged_ui.stats';
@@ -2370,9 +2370,9 @@
{
$this->t->set_var('project_name', $myproject );
- $this->t->set_var('rejected_block_handle', "");
+ $this->t->set_var('refused_block_handle', "");
$this->t->set_var('delivered_block_handle', "");
- $this->t->set_var('approved_block_handle', "");
+ $this->t->set_var('accepted_block_handle', "");
$stats_delivered=null;
$stats_delivered=$this->ged_dm->get_stats($datetime_start, $datetime_end,
'pending_for_approval',$my_element_id);
@@ -2409,13 +2409,13 @@
$this->t->set_var('count_delivered', $count);
- $stats_approved=null;
-
$stats_approved=$this->ged_dm->get_stats($datetime_start, $datetime_end,
'current',$my_element_id);
+ $stats_accepted=null;
+
$stats_accepted=$this->ged_dm->get_stats($datetime_start, $datetime_end,
'current',$my_element_id);
$count=0;
- if (isset($stats_approved))
+ if (isset($stats_accepted))
{
- foreach ( $stats_approved as $element )
+ foreach ( $stats_accepted as $element )
{
$this->t->set_var('element_id', $element['element_id']);
$this->t->set_var('version_id', $element['version_id']);
@@ -2436,20 +2436,20 @@
$this->t->set_var('search_link',
$GLOBALS['phpgw']->link('/index.php', $link_data));
$count++;
- $this->t->fp('approved_block_handle',
'approved_block', True);
+ $this->t->fp('accepted_block_handle',
'accepted_block', True);
}
}
- $this->t->set_var('count_approved', $count);
+ $this->t->set_var('count_accepted', $count);
- $stats_rejected=null;
-
$stats_rejected=$this->ged_dm->get_stats($datetime_start, $datetime_end,
'rejected',$my_element_id);
+ $stats_refused=null;
+
$stats_refused=$this->ged_dm->get_stats($datetime_start, $datetime_end,
'refused',$my_element_id);
$count=0;
- if (isset($stats_rejected))
+ if (isset($stats_refused))
{
- foreach ( $stats_rejected as $element )
+ foreach ( $stats_refused as $element )
{
$this->t->set_var('element_id', $element['element_id']);
$this->t->set_var('version_id', $element['version_id']);
@@ -2470,12 +2470,12 @@
$this->t->set_var('search_link',
$GLOBALS['phpgw']->link('/index.php', $link_data));
$count++;
- $this->t->fp('rejected_block_handle',
'rejected_block', True);
+ $this->t->fp('refused_block_handle',
'refused_block', True);
}
}
- $this->t->set_var('count_rejected', $count);
+ $this->t->set_var('count_refused', $count);
$this->t->fp('ged_projects_handle', 'ged_projects',
True);
}
Index: templates/base/home.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/home.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/home.tpl 13 Jul 2007 20:37:26 -0000 1.2
+++ templates/base/home.tpl 17 Jul 2007 11:13:06 -0000 1.3
@@ -51,17 +51,17 @@
<!-- END alert_docs_list -->
</table>
<!-- End Alert documents Table -->
-<!-- Rejected documents table -->
+<!-- Refused documents table -->
<table>
<tr><td colspan="2">Rejected</td></tr>
-<!-- BEGIN rejected_docs_list -->
+<!-- BEGIN refused_docs_list -->
<tr>
<td width="16"><img src="{status_image}"/></td>
<td ><a href="{doc_link}">{doc_name} [{doc_reference}] v{version}</a></td>
</tr>
-<!-- END rejected_docs_list -->
+<!-- END refused_docs_list -->
</table>
-<!-- End Rejected documents table -->
+<!-- End Refused documents table -->
</td>
</tr>
</table>
Index: templates/base/stats.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/stats.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/stats.tpl 13 Jul 2007 20:37:26 -0000 1.1
+++ templates/base/stats.tpl 17 Jul 2007 11:13:06 -0000 1.2
@@ -36,7 +36,7 @@
<h3>Documents approved during period : {count_approved}</h2>
<table cellspacing="0" cellpadding="0" width="70%">
-<!-- BEGIN approved_block -->
+<!-- BEGIN accepted_block -->
<tr>
<td width="20" height="16" valign="bottom">
<img height="16" src="{status_image}">
@@ -53,13 +53,13 @@
<tr height="5px">
<td></td>
</tr>
-<!-- END approved_block -->
+<!-- END accepted_block -->
</table>
<h3>Documents rejected during period : {count_rejected}</h2>
<table cellspacing="0" cellpadding="0" width="70%">
-<!-- BEGIN rejected_block -->
+<!-- BEGIN refused_block -->
<tr>
<td width="20" height="16" valign="bottom">
<img height="16" src="{status_image}">
@@ -76,7 +76,7 @@
<tr height="5px">
<td></td>
</tr>
-<!-- END rejected_block -->
+<!-- END refused_block -->
</table>
<!-- END ged_projects -->
Index: setup/tables_update.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/setup/tables_update.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- setup/tables_update.inc.php 10 Apr 2007 13:30:28 -0000 1.6
+++ setup/tables_update.inc.php 17 Jul 2007 11:13:06 -0000 1.7
@@ -14,6 +14,8 @@
$test[]='0.9.16.000';
$test[]='0.9.16.001';
$test[]='0.9.18.001';
+ $test[]='0.9.18.002';
+
function ged_upgrade0_9_16_000()
{
@@ -141,4 +143,14 @@
}
+ function ged_upgrade0_9_18_002()
+ {
+ $GLOBALS['phpgw_setup']->oProc->query ("UPDATE ged_versions SET
status='refused' WHERE status='rejected'" );
+ $GLOBALS['phpgw_setup']->oProc->query ("UPDATE ged_history SET
status='refused' WHERE status='rejected'" );
+
+ $GLOBALS['setup_info']['ged']['currentver']='0.9.18.003';
+ return $GLOBALS['setup_info']['ged']['currentver'];
+
+ }
+
?>
\ No newline at end of file
Index: setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/setup/setup.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- setup/setup.inc.php 10 Apr 2007 09:41:09 -0000 1.6
+++ setup/setup.inc.php 17 Jul 2007 11:13:06 -0000 1.7
@@ -13,7 +13,7 @@
$setup_info['ged']['name']='ged';
$setup_info['ged']['title']='Document Management';
- $setup_info['ged']['version']='0.9.18.002';
+ $setup_info['ged']['version']='0.9.18.003';
$setup_info['ged']['app_order']=17;
$setup_info['ged']['enable']=1;