[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16846] Syncromind: Merge 16836:16845 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16846] Syncromind: Merge 16836:16845 from trunk |
|
Date: |
Wed, 7 Jun 2017 06:42:26 -0400 (EDT) |
Revision: 16846
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16846
Author: sigurdne
Date: 2017-06-07 06:42:26 -0400 (Wed, 07 Jun 2017)
Log Message:
-----------
Syncromind: Merge 16836:16845 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/controller/js/controller/ajax.js
branches/dev-syncromind-2/property/inc/class.sogeneric_document.inc.php
branches/dev-syncromind-2/property/inc/class.uilocation.inc.php
branches/dev-syncromind-2/property/setup/phpgw_no.lang
Property Changed:
----------------
branches/dev-syncromind-2/
Index: branches/dev-syncromind-2
===================================================================
--- branches/dev-syncromind-2 2017-06-07 09:10:58 UTC (rev 16845)
+++ branches/dev-syncromind-2 2017-06-07 10:42:26 UTC (rev 16846)
Property changes on: branches/dev-syncromind-2
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
-/trunk:14934-14935,15165-15215,15218-15220,15222-15304,15306-15337,15339,15341-15398,15400-15421,15423-15474,15476-15607,15609,15611,15613-15652,15654-15732,15734,15736-15746,15750-15770,15772-15775,15777-15795,15797-15798,15800-15812,15814-15838,15840,15842-15888,15890,15892-15997,15999-16097,16103-16128,16131-16187,16190-16299,16301-16393,16396-16586,16589-16737,16740-16786,16789-16834
\ No newline at end of property
+/trunk:14934-14935,15165-15215,15218-15220,15222-15304,15306-15337,15339,15341-15398,15400-15421,15423-15474,15476-15607,15609,15611,15613-15652,15654-15732,15734,15736-15746,15750-15770,15772-15775,15777-15795,15797-15798,15800-15812,15814-15838,15840,15842-15888,15890,15892-15997,15999-16097,16103-16128,16131-16187,16190-16299,16301-16393,16396-16586,16589-16737,16740-16786,16789-16834,16837-16845
\ No newline at end of property
Modified: branches/dev-syncromind-2/controller/js/controller/ajax.js
===================================================================
--- branches/dev-syncromind-2/controller/js/controller/ajax.js 2017-06-07
09:10:58 UTC (rev 16845)
+++ branches/dev-syncromind-2/controller/js/controller/ajax.js 2017-06-07
10:42:26 UTC (rev 16846)
@@ -33,6 +33,12 @@
return false;
});
+
+ $("#popupBox").click(function ()
+ {
+ $("#popupBox").hide();
+ $("#curtain").hide();
+ });
/* ================================ CONTROL LOCATION
================================== */
Modified:
branches/dev-syncromind-2/property/inc/class.sogeneric_document.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.sogeneric_document.inc.php
2017-06-07 09:10:58 UTC (rev 16845)
+++ branches/dev-syncromind-2/property/inc/class.sogeneric_document.inc.php
2017-06-07 10:42:26 UTC (rev 16846)
@@ -131,7 +131,7 @@
$querymethod .= " OR metadata->>'path' ilike
'%{$query}%')";
}
- $sql = "SELECT DISTINCT a.file_id, a.* FROM phpgw_vfs a
" ." {$joinmethod} "." {$filtermethod} "." {$querymethod} ";
+ $sql = "SELECT DISTINCT a.file_id, a.*,
metadata->>'path' as path FROM phpgw_vfs a " ." {$joinmethod} "."
{$filtermethod} "." {$querymethod} ";
$this->db->query($sql, __LINE__, __FILE__);
$this->total_records = $this->db->num_rows();
@@ -166,7 +166,8 @@
'name' => $this->db->f('name'),
'link_directory' =>
$this->db->f('link_directory', true),
'link_name' =>
$this->db->f('link_name', true),
- 'version' =>
$this->db->f('version')
+ 'version' =>
$this->db->f('version'),
+ 'path' =>
$this->db->f('path'),
);
}
}
Modified: branches/dev-syncromind-2/property/inc/class.uilocation.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uilocation.inc.php
2017-06-07 09:10:58 UTC (rev 16845)
+++ branches/dev-syncromind-2/property/inc/class.uilocation.inc.php
2017-06-07 10:42:26 UTC (rev 16846)
@@ -1721,13 +1721,20 @@
$total_records += $generic_document->total_records;
foreach ($documents2 as $item)
{
+ $title = '';
+ if($item['path'])
+ {
+ $temp = json_decode($item['path']);
+ $title = implode('<br/>', $temp);
+ }
+
$document_name = '<a
href="'.self::link(array('menuaction'=>'property.uigeneric_document.view_file',
'file_id'=>$item['id'])).'" target="_blank">'.$item['name'].'</a>';
$values[] = array(
'id'=> $item['id'],
'type'=> 'generic',
'document_name' => $document_name,
- 'title'=> $item['title'],
- 'document_date' =>
$item['document_date'] // fixme
+ 'title'=> $title,
+ 'document_date' => $item['created']
);
}
Modified: branches/dev-syncromind-2/property/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind-2/property/setup/phpgw_no.lang 2017-06-07
09:10:58 UTC (rev 16845)
+++ branches/dev-syncromind-2/property/setup/phpgw_no.lang 2017-06-07
10:42:26 UTC (rev 16846)
@@ -2107,4 +2107,23 @@
canceled property no Kansellert
substitute property no Vikar
set substitute property no Sett vikar
-circle reference property no Sirkelreferanse
\ No newline at end of file
+circle reference property no Sirkelreferanse
+reports property no Rapporter
+report generator property no Rapportgenerator
+datasets property no Datasett
+dataset property no Datasett
+dataset name property no Navn på datasett
+group by property no Gruppering
+sort by property no Sortering
+count / sum property no Telling og Summering
+criteria property no Kriterier
+operator property no Operator
+restricted value property no Felt for avgrensing
+conector property no Koblingstype
+report name property no Navn på rapport
+choose property no Velg
+unselect property no Nullstill
+get columns property no Hent kolonner
+and property no Og
+or property no Eller
+show property no Vis
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16846] Syncromind: Merge 16836:16845 from trunk,
sigurdne <=