[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.socat...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.socat... |
|
Date: |
Tue, 26 Sep 2006 18:29:28 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/26 18:29:28
Modified files:
inc : class.bocommon.inc.php class.socategory.inc.php
class.soproject.inc.php class.uiproject.inc.php
class.uitts.inc.php
Log message:
notice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.socategory.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soproject.inc.php?cvsroot=phpgroupware&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.42&r2=1.43
Patches:
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- class.bocommon.inc.php 26 Sep 2006 13:46:01 -0000 1.38
+++ class.bocommon.inc.php 26 Sep 2006 18:29:27 -0000 1.39
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.bocommon.inc.php,v 1.38 2006/09/26 13:46:01
sigurdne Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.39 2006/09/26 18:29:27
sigurdne Exp $
*/
/**
@@ -130,13 +130,23 @@
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$jsDateFormat = str_replace(array('d', 'm', 'M', 'Y'),
array('%d', '%m', '%b', '%Y'), $dateformat);
- $GLOBALS['phpgw_info']['flags']['java_script']
.='</script>
+
+ $java_script ='</script>
<link rel="stylesheet" type="text/css" media="all"
href="'.$phpgw_js_url.'/jscalendar/calendar-win2k-cold-1.css"
title="win2k-cold-1" >
<script type="text/javascript"
src="'.$phpgw_js_url.'/jscalendar/calendar.js"></script>
<script type="text/javascript"
src="'.$phpgw_js_url.'/jscalendar/calendar-setup.js"></script>
<script type="text/javascript"
src="'.$phpgw_js_url.'/jscalendar/lang/calendar-'.substr($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'],0,2)
.'.js"></script>
';
+
if(isset($GLOBALS['phpgw_info']['flags']['java_script']))
+ {
+ $GLOBALS['phpgw_info']['flags']['java_script']
.= $java_script;
+ }
+ else
+ {
+ $GLOBALS['phpgw_info']['flags']['java_script']
= $java_script;
+ }
+
// <script type="text/javascript"
src="'.ereg_replace('[?&]*click_history=[0-9a-f]*','',$GLOBALS['phpgw']->link('/phpgwapi/js/jscalendar/jscalendar-setup.php')).'"></script>
@@ -530,7 +540,7 @@
$user_list[] = array
(
'user_id' =>
$user['account_id'],
- 'name' =>
$user['account_lastname'].' '.$user['account_firstname'],
+ 'name' =>
(isset($user['account_lastname'])?$user['account_lastname'].'
':'').$user['account_firstname'],
'selected' => $sel_user
);
}
Index: class.socategory.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.socategory.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.socategory.inc.php 19 Apr 2006 07:38:14 -0000 1.17
+++ class.socategory.inc.php 26 Sep 2006 18:29:27 -0000 1.18
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.socategory.inc.php,v 1.17 2006/04/19 07:38:14
sigurdne Exp $
+ * @version $Id: class.socategory.inc.php,v 1.18 2006/09/26 18:29:27
sigurdne Exp $
*/
/**
@@ -215,7 +215,7 @@
'name' =>
stripslashes($this->db->f('descr'))
);
}
- return $categories;
+ return (isset($categories)?$categories:false);
}
Index: class.soproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- class.soproject.inc.php 9 Jul 2006 17:47:38 -0000 1.30
+++ class.soproject.inc.php 26 Sep 2006 18:29:27 -0000 1.31
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.soproject.inc.php,v 1.30 2006/07/09 17:47:38
sigurdne Exp $
+ * @version $Id: class.soproject.inc.php,v 1.31 2006/09/26 18:29:27
sigurdne Exp $
*/
/**
@@ -208,6 +208,7 @@
$where= 'WHERE';
+ $filtermethod = '';
if ($cat_id > 0)
{
$filtermethod .= " $where
fm_project.category=$cat_id ";
@@ -226,6 +227,10 @@
$where= 'AND';
$group_method = " group by
fm_project.location_code,fm_project.id
,fm_project.start_date,fm_project.name,account_lid
,fm_project.user_id,fm_project.address";
}
+ else
+ {
+ $group_method = '';
+ }
if ($filter=='all')
{
@@ -270,6 +275,10 @@
$querymethod = " $where
(fm_project.name $this->like '%$query%' or fm_project.address $this->like
'%$query%' or fm_project.location_code $this->like '%$query%' or fm_project.id
$this->like '%$query%')";
}
}
+ else
+ {
+ $querymethod = '';
+ }
$sql .= " $filtermethod $querymethod $group_method";
//echo $sql;
@@ -284,6 +293,7 @@
$this->db->query($sql .
$ordermethod,__LINE__,__FILE__);
}
+ $project_list = array();
$j=0;
$k=count($cols_return);
while ($this->db->next_record())
Index: class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- class.uiproject.inc.php 18 Sep 2006 13:11:35 -0000 1.33
+++ class.uiproject.inc.php 26 Sep 2006 18:29:27 -0000 1.34
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiproject.inc.php,v 1.33 2006/09/18 13:11:35
sigurdne Exp $
+ * @version $Id: class.uiproject.inc.php,v 1.34 2006/09/26 18:29:27
sigurdne Exp $
*/
/**
@@ -28,6 +28,7 @@
var $part_of_town_id;
var $sub;
var $currentapp;
+ var $district_id;
var $public_functions = array
(
@@ -226,7 +227,7 @@
'var' => 'location_code',
'order' => $this->order,
'extra' => array('menuaction' => $this->currentapp.'.uiproject.index',
-
'type_id' =>
$type_id,
+
// 'type_id' =>
$type_id,
'query' =>
$this->query,
'lookup' =>
$lookup,
'from' =>
$from,
@@ -247,7 +248,7 @@
'var' => 'project_id',
'order' => $this->order,
'extra' => array('menuaction' => $this->currentapp.'.uiproject.index',
-
'type_id' =>
$type_id,
+
// 'type_id' =>
$type_id,
'query' =>
$this->query,
'lookup' =>
$lookup,
'from' =>
$from,
@@ -268,7 +269,7 @@
'var' => 'address',
'order' => $this->order,
'extra' => array('menuaction' => $this->currentapp.'.uiproject.index',
-
'type_id' =>
$type_id,
+
// 'type_id' =>
$type_id,
'query' =>
$this->query,
'lookup' =>
$lookup,
'from' =>
$from,
@@ -416,7 +417,7 @@
'query' => $this->query,
'lang_search' =>
lang('search'),
'table_header' =>
$table_header,
- 'values' => $content,
+ 'values' =>
(isset($content)?$content:''),
'table_add' => $table_add
);
@@ -433,16 +434,16 @@
function date_search()
{
$GLOBALS['phpgw']->xslttpl->add_file(array('date_search'));
- $GLOBALS['phpgw_info']['flags']['noframework'] = True;
- $GLOBALS['phpgw_info']['flags'][noheader] = True;
- $GLOBALS['phpgw_info']['flags'][nofooter] = True;
+ // $GLOBALS['phpgw_info']['flags']['noframework'] = True;
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = True;
+ // $GLOBALS['phpgw_info']['flags']['noheader'] = True;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = True;
$values['start_date'] =
get_var('start_date',array('POST'));
$values['end_date'] =
get_var('end_date',array('POST'));
$function_msg = lang('Date search');
$appname = lang('project');
-
$dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$sep = '/';
$dlarr[strpos($dateformat,'y')] = 'yyyy';
@@ -477,7 +478,7 @@
'value_end_date' =>
$values['end_date'],
'dateformat' => $dateformat,
- 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
+ // 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_submit_statustext' => lang('Select
this dates'),
'lang_submit' =>
lang('Submit')
);
Index: class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- class.uitts.inc.php 26 Sep 2006 13:46:01 -0000 1.42
+++ class.uitts.inc.php 26 Sep 2006 18:29:27 -0000 1.43
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.uitts.inc.php,v 1.42 2006/09/26 13:46:01 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.43 2006/09/26 18:29:27 sigurdne
Exp $
*/
/**
@@ -577,10 +577,13 @@
$insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
$insert_record_entity =
$GLOBALS['phpgw']->session->appsession('insert_record_entity',$this->currentapp);
+ if(isset($insert_record_entity) &&
is_array($insert_record_entity))
+ {
for ($j=0;$j<count($insert_record_entity);$j++)
{
$insert_record['extra'][$insert_record_entity[$j]] =
$insert_record_entity[$j];
}
+ }
$GLOBALS['phpgw']->xslttpl->add_file(array('tts'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.bocommon.inc.php class.socat...,
Sigurd Nes <=