[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14053] rental: formatting
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14053] rental: formatting |
Date: |
Tue, 29 Sep 2015 13:53:05 +0000 |
Revision: 14053
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14053
Author: sigurdne
Date: 2015-09-29 13:53:04 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------
rental: formatting
Modified Paths:
--------------
branches/dev-syncromind/rental/inc/class.bofellesdata.inc.php
Modified: branches/dev-syncromind/rental/inc/class.bofellesdata.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.bofellesdata.inc.php
2015-09-29 13:48:07 UTC (rev 14052)
+++ branches/dev-syncromind/rental/inc/class.bofellesdata.inc.php
2015-09-29 13:53:04 UTC (rev 14053)
@@ -174,7 +174,9 @@
$sql = "SELECT $column FROM $table WHERE
V_ORG_ENHET.RESULTATENHET = $result_unit";
if($level)
+ {
$sql = "$sql AND V_ORG_ENHET.ORG_NIVAA
= $level";
+ }
if($db->Type == "postgres")
{
$sql = strtolower($sql);
@@ -216,7 +218,9 @@
$sql = "SELECT $column FROM $table WHERE
V_ORG_ENHET.ORG_ENHET_ID = $org_unit_id";
if($level)
+ {
$sql = "$sql AND V_ORG_ENHET.ORG_NIVAA
= $level";
+ }
if($db->Type == "postgres")
{
@@ -590,7 +594,9 @@
"upper(BRUKERNAVN) LIKE '%$search_word%')";
}
if($count <
(count($search_words) - 1))
+ {
$selector
= $selector . " OR ";
+ }
$count =
($count + 1);
}
$selector = $selector . ")";
@@ -748,7 +754,9 @@
"upper(BRUKERNAVN) LIKE '%$search_word%')";
}
if($count <
(count($search_words) - 1))
+ {
$selector
= $selector . " OR ";
+ }
$count =
($count + 1);
}
$selector = $selector . ")";
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14053] rental: formatting,
Sigurd Nes <=