[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7674]
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [7674] |
Date: |
Tue, 20 Sep 2011 10:13:43 +0000 |
Revision: 7674
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7674
Author: erikhl
Date: 2011-09-20 10:13:42 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_item.inc.php
trunk/controller/inc/class.uicontrol_item.inc.php
trunk/controller/setup/phpgw_no.lang
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2011-09-20 09:01:39 UTC
(rev 7673)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2011-09-20 10:13:42 UTC
(rev 7674)
@@ -180,16 +180,9 @@
$like_pattern = "'%".$search_for."%'";
$like_clauses = array();
switch($search_type){
- case "title":
- $like_clauses[] =
"rental_document.title $this->like $like_pattern";
+ default:
+ $like_clauses[] =
"controller_control_item.title $this->like $like_pattern";
break;
- case "name":
- $like_clauses[] = "rental_document.name
$this->like $like_pattern";
- break;
- case "all":
- $like_clauses[] =
"rental_document.title $this->like $like_pattern";
- $like_clauses[] = "rental_document.name
$this->like $like_pattern";
- break;
}
if(count($like_clauses))
@@ -200,24 +193,9 @@
if(isset($filters[$this->get_id_field_name()]))
{
- $filter_clauses[] = "rental_document.id =
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
+ $filter_clauses[] = "controller_control_item.id =
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
}
- if(isset($filters['contract_id']))
- {
- $filter_clauses[] = "rental_document.contract_id =
{$this->marshal($filters['contract_id'],'int')}";
- }
-
- if(isset($filters['party_id']))
- {
- $filter_clauses[] = "rental_document.party_id =
{$this->marshal($filters['party_id'],'int')}";
- }
-
- if(isset($filters['document_type']) &&
$filters['document_type'] != 'all')
- {
- $filter_clauses[] = "rental_document.type_id =
{$this->marshal($filters['document_type'],'int')}";
- }
-
if(count($filter_clauses))
{
$clauses[] = join(' AND ', $filter_clauses);
@@ -227,11 +205,11 @@
$condition = join(' AND ', $clauses);
$tables = "controller_control_item";
- $joins = " {$this->left_join} rental_document_types ON
(rental_document.type_id = rental_document_types.id)";
+ //$joins = " {$this->left_join} rental_document_types ON
(rental_document.type_id = rental_document_types.id)";
if($return_count)
{
- $cols = 'COUNT(DISTINCT(rental_document.id)) AS count';
+ $cols = 'COUNT(DISTINCT(controller_control_item.id)) AS
count';
}
else
{
@@ -241,18 +219,14 @@
$dir = $ascending ? 'ASC' : 'DESC';
if($sort_field == 'title')
{
- $sort_field = 'rental_document.title';
+ $sort_field = 'controller_control_item.title';
}
- else if($sort_field == 'type')
- {
- $sort_field = 'rental_document_types.title';
- }
$order = $sort_field ? "ORDER BY {$this->marshal($sort_field,
'field')} $dir ": '';
//var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}");
//return "SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}";
- return "SELECT {$cols} FROM {$tables}";
+ return "SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}";
}
function populate(int $control_item_id, &$control_item)
Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php 2011-09-20 09:01:39 UTC
(rev 7673)
+++ trunk/controller/inc/class.uicontrol_item.inc.php 2011-09-20 10:13:42 UTC
(rev 7674)
@@ -463,8 +463,16 @@
'dir' => phpgw::get_var('dir'),
'filters' => $filters
);
+
+ $search_for = phpgw::get_var('query');
- $user_rows_per_page = 10;
+
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
+ {
+ $user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ }
+ else {
+ $user_rows_per_page = 10;
+ }
// YUI variables for paging and sorting
$start_index = phpgw::get_var('startIndex', 'int');
@@ -482,10 +490,11 @@
$control_item_id = phpgw::get_var('control_item_id');
if(isset($control_item_id))
{
- $control_item =
rental_socontract::get_instance()->get_single($control_item_id);
+ $control_item =
$this->so_control_item->get_single($control_item_id);
}
- $result_objects =
controller_socontrol_item::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
+ $result_objects =
$this->so_control_item->get($start_index, $num_of_objects, $sort_field,
$sort_ascending, $search_for, $search_type, $filters);
+ //var_dump($result_objects);
$results = array();
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2011-09-20 09:01:39 UTC (rev
7673)
+++ trunk/controller/setup/phpgw_no.lang 2011-09-20 10:13:42 UTC (rev
7674)
@@ -227,4 +227,13 @@
Procedure responsibility controller no Ansvarlig
Procedure description controller no Beskrivelse
Procedure reference controller no Referanse
-Procedure attachment controller no Vedlegg
\ No newline at end of file
+Procedure attachment controller no Vedlegg
+New control item controller no Nytt kontrollpunkt
+Control item title controller no Tittel
+Control_group controller no Kontrollgruppe
+Control group controller no Kontrollgruppe
+Control_area controller no Kontrollområde
+Control area controller no Kontrollområde
+Control item what to do controller no Hva skal gjøres
+Not selected controller no Ingen valgt
+searchfield controller no Søkefelt
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7674],
Erik Holm-Larsen <=