[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7813] Merge 7810:7812 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7813] Merge 7810:7812 from trunk |
|
Date: |
Tue, 04 Oct 2011 14:18:35 +0000 |
Revision: 7813
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7813
Author: sigurdne
Date: 2011-10-04 14:18:35 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
Merge 7810:7812 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/setup/tables_current.inc.php
branches/Version-1_0-branch/activitycalendar/setup/tables_update.inc.php
branches/Version-1_0-branch/property/inc/class.borequest.inc.php
branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/request.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812
Modified:
branches/Version-1_0-branch/activitycalendar/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/tables_current.inc.php
2011-10-04 13:57:48 UTC (rev 7812)
+++ branches/Version-1_0-branch/activitycalendar/setup/tables_current.inc.php
2011-10-04 14:18:35 UTC (rev 7813)
@@ -23,6 +23,8 @@
'special_adaptation' => array('type' =>
'bool','nullable' => true,'default' => 'false'),
'contact_person_2_address' => array('type' =>
'varchar','precision' => '255'),
'contact_person_2_zip' => array('type' =>
'varchar','precision' => '255'),
+ 'frontend' => array('type' => 'bool','nullable'
=> true,'default' => 'false'),
+ 'new_org' => array('type' => 'bool','nullable'
=> true,'default' => 'false')
),
'pk' => array('id'),
'fk' => array(),
Modified:
branches/Version-1_0-branch/activitycalendar/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/tables_update.inc.php
2011-10-04 13:57:48 UTC (rev 7812)
+++ branches/Version-1_0-branch/activitycalendar/setup/tables_update.inc.php
2011-10-04 14:18:35 UTC (rev 7813)
@@ -137,7 +137,8 @@
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('activity_activity','frontend',array(
'type' => 'bool',
- 'default' => 'false'
+ 'nullable' => 'false',
+ 'nullable' => true
));
$GLOBALS['setup_info']['activitycalendar']['currentver'] =
'0.1.6';
@@ -150,6 +151,7 @@
$GLOBALS['phpgw_setup']->oProc->AddColumn('activity_activity','new_org',array(
'type' => 'bool',
'default' => 'false',
+ 'nullable' => true
));
$GLOBALS['setup_info']['activitycalendar']['currentver'] =
'0.1.7';
Modified: branches/Version-1_0-branch/property/inc/class.borequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.borequest.inc.php
2011-10-04 13:57:48 UTC (rev 7812)
+++ branches/Version-1_0-branch/property/inc/class.borequest.inc.php
2011-10-04 14:18:35 UTC (rev 7813)
@@ -160,7 +160,7 @@
$this->order = $data['order'];
$this->district_id = $data['district_id'];
$this->cat_id = $data['cat_id'];
- $this->property_cat_id = $data['property_cat_id'];
+ $this->property_cat_id = $data['property_cat_id'];
$this->status_id = $data['status_id'];
$this->start_date =
isset($data['start_date']) ? $data['start_date']: '';
$this->end_date =
isset($data['end_date']) ? $data['end_date']: '';
Modified: branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
2011-10-04 13:57:48 UTC (rev 7812)
+++ branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
2011-10-04 14:18:35 UTC (rev 7813)
@@ -218,6 +218,7 @@
$entity_table = 'fm_request';
+ $uicols = array();
$cols .= "{$entity_table}.location_code";
$cols_return[] =
'location_code';
$cols_group[] =
"{$entity_table}.location_code";
@@ -225,18 +226,7 @@
$cols .= ",{$entity_table}.id as request_id";
$cols_return[] = 'request_id';
- $uicols['input_type'][] = 'text';
- $uicols['name'][] = 'request_id';
- $uicols['descr'][] =
lang('Request');
- $uicols['statustext'][] = lang('Request ID');
- $uicols['exchange'][] = '';
- $uicols['align'][] = '';
- $uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
- $uicols['classname'][] = '';
- $uicols['sortable'][] = true;
-
$cols.= ",fm_request_status.descr as status";
$cols_return[] = 'status';
$cols_group[] =
'fm_request_status.descr';
@@ -410,7 +400,7 @@
$sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols'=>$cols,'cols_return'=>$cols_return,
-
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,
+
'uicols'=>array(),'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,
'query'=>$query,'force_location'=>true));
$cols_group[] = "{$entity_table}.id";
@@ -504,7 +494,28 @@
$sql .= " $filtermethod $querymethod $groupmethod";
//_debug_array($sql);
- $this->uicols = $this->bocommon->uicols;
+ $this->uicols['input_type'] =
array_merge($this->bocommon->uicols['input_type'], $uicols['input_type']);
+ $this->uicols['name'] =
array_merge($this->bocommon->uicols['name'], $uicols['name']);
+ $this->uicols['descr'] =
array_merge($this->bocommon->uicols['descr'], $uicols['descr']);
+ $this->uicols['statustext'] =
array_merge($this->bocommon->uicols['statustext'], $uicols['statustext']);
+ $this->uicols['exchange'] =
array_merge($this->bocommon->uicols['exchange'], $uicols['exchange']);
+ $this->uicols['align'] =
array_merge($this->bocommon->uicols['align'], $uicols['align']);
+ $this->uicols['datatype'] =
array_merge($this->bocommon->uicols['datatype'], $uicols['datatype']);
+ $this->uicols['formatter'] =
array_merge($this->bocommon->uicols['formatter'], $uicols['formatter']);
+ $this->uicols['classname'] =
array_merge($this->bocommon->uicols['classname'], $uicols['classname']);
+ $this->uicols['sortable'] =
array_merge($this->bocommon->uicols['sortable'], $uicols['sortable']);
+
+ array_unshift($this->uicols['input_type'],'text');
+ array_unshift($this->uicols['name'],'request_id');
+ array_unshift($this->uicols['descr'],'ID');
+ array_unshift($this->uicols['statustext'],'Request ID');
+ array_unshift($this->uicols['exchange'],'');
+ array_unshift($this->uicols['align'],'');
+ array_unshift($this->uicols['datatype'],'');
+ array_unshift($this->uicols['formatter'],'');
+ array_unshift($this->uicols['classname'],'');
+ array_unshift($this->uicols['sortable'],true);
+
$cols_return = $this->bocommon->cols_return;
$type_id =
$this->bocommon->type_id;
$this->cols_extra = $this->bocommon->cols_extra;
Modified: branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-10-04 13:57:48 UTC (rev 7812)
+++ branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-10-04 14:18:35 UTC (rev 7813)
@@ -84,7 +84,7 @@
$this->sort =
$this->bo->sort;
$this->order =
$this->bo->order;
$this->filter =
$this->bo->filter;
- $this->property_cat_id =
$this->property_cat_id;
+ $this->property_cat_id =
$this->bo->property_cat_id;
$this->cat_id =
$this->bo->cat_id;
$this->status_id =
$this->bo->status_id;
$this->district_id =
$this->bo->district_id;
@@ -98,20 +98,20 @@
function save_sessiondata()
{
$data = array
- (
- 'start' => $this->start,
- 'query' => $this->query,
- 'sort' => $this->sort,
- 'order' => $this->order,
- 'filter' =>
$this->filter,
- 'cat_id' =>
$this->cat_id,
- 'status_id' =>
$this->status_id,
- 'district_id' => $this->district_id,
- 'allrows' =>
$this->allrows,
- 'start_date' => $this->start_date,
- 'end_date' =>
$this->end_date,
- 'property_cat_id' =>
$this->property_cat_id,
- );
+ (
+ 'start' => $this->start,
+ 'query' => $this->query,
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'filter' =>
$this->filter,
+ 'cat_id' =>
$this->cat_id,
+ 'status_id' =>
$this->status_id,
+ 'district_id' => $this->district_id,
+ 'allrows' =>
$this->allrows,
+ 'start_date' => $this->start_date,
+ 'end_date' =>
$this->end_date,
+ 'property_cat_id' =>
$this->property_cat_id,
+ );
$this->bo->save_sessiondata($data);
}
@@ -228,7 +228,7 @@
'end_date' =>
$this->end_date
));
- $datatable['config']['allow_allrows'] = true;
+ $datatable['config']['allow_allrows'] = false;
$datatable['config']['base_java_url'] =
"menuaction:'property.uirequest.index',"
."p_num: '{$this->p_num}',"
@@ -742,7 +742,7 @@
$appname =
lang('request');
$function_msg = lang('list
request');
- if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
+ if ( !$this->start && !$this->order)
{
$datatable['sorting']['currentPage'] = 1;
$datatable['sorting']['order'] = 'request_id';
// name key Column in myColumnDef
@@ -751,11 +751,10 @@
else
{
$datatable['sorting']['currentPage'] =
phpgw::get_var('currentPage');
- $datatable['sorting']['order'] =
phpgw::get_var('order', 'string'); // name of column of Database
- $datatable['sorting']['sort'] =
phpgw::get_var('sort', 'string'); // ASC / DESC
+ $datatable['sorting']['order'] = $this->order;
// name of column of Database
+ $datatable['sorting']['sort'] = $this->sort;
// ASC / DESC
}
-
//-- BEGIN----------------------------- JSON CODE
------------------------------
//values for Pagination
@@ -1522,7 +1521,6 @@
'location_type'
=> 'form',
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uirequest.index')),
- 'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-10-04
13:57:48 UTC (rev 7812)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-10-04
14:18:35 UTC (rev 7813)
@@ -351,7 +351,7 @@
consequence property no Konsekvens
consequence type property no Konsekvenstype
consequential damage property no Følgeskader
-consume property no forbruk
+consume property no Forbrukt
consume date property no Dato historisk forbruk
consume value property no Beløp historisk forbruk
consume history property no Historisk forbruk
@@ -1889,6 +1889,7 @@
in progress date property no Påbegynt dato
delivered date property no Utført dato
closed date property no Avsluttet dato
+cost categories property no Kostnadskategori
no symptoms property no Ingen Symptomer
minor symptoms property no Svake Symptomer
medium symptoms property no Middels Symptomer
Modified: branches/Version-1_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/request.xsl
2011-10-04 13:57:48 UTC (rev 7812)
+++ branches/Version-1_0-branch/property/templates/base/request.xsl
2011-10-04 14:18:35 UTC (rev 7813)
@@ -286,7 +286,7 @@
</tr>
<tr>
<td>
-
<xsl:value-of select="lang_category"/>
+
<xsl:value-of select="php:function('lang', 'cost categories')" />
</td>
<td>
<xsl:call-template name="categories"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7813] Merge 7810:7812 from trunk,
Sigurd Nes <=