[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16855] Stable: Merge 16852:16854 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16855] Stable: Merge 16852:16854 from trunk |
|
Date: |
Thu, 8 Jun 2017 13:38:06 -0400 (EDT) |
Revision: 16855
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16855
Author: sigurdne
Date: 2017-06-08 13:38:06 -0400 (Thu, 08 Jun 2017)
Log Message:
-----------
Stable: Merge 16852:16854 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.sogeneric_document.inc.php
branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
Added Paths:
-----------
branches/Version-2_0-branch/phpgwapi/doc/Vagrantfile
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-06-08 17:36:29 UTC (rev 16854)
+++ branches/Version-2_0-branch 2017-06-08 17:38:06 UTC (rev 16855)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854
\ No newline at end of property
Copied: branches/Version-2_0-branch/phpgwapi/doc/Vagrantfile (from rev 16854,
trunk/phpgwapi/doc/Vagrantfile)
===================================================================
--- branches/Version-2_0-branch/phpgwapi/doc/Vagrantfile
(rev 0)
+++ branches/Version-2_0-branch/phpgwapi/doc/Vagrantfile 2017-06-08
17:38:06 UTC (rev 16855)
@@ -0,0 +1,147 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+# Sigurd: This file will create a virtualbox instance of ubuntu server 16.04
LTS,
+# complete with postgresql, apache, php and xdebug.
+# The user 'portico' has password 'portico' - and is member of sudoers.
+# Roles/Passwd in posgresql: portico/portico, vagrant/vagrant
+# Portmapping: 80 -> 8080, 20 -> 2222 and 5432 -> 5433
+# Usage: $ vagrant up
+# Docs: https://www.vagrantup.com/
+#
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+ # The most common configuration options are documented and commented below.
+ # For a complete reference, please see the online documentation at
+ # https://docs.vagrantup.com.
+
+ # Every Vagrant development environment requires a box. You can search for
+ # boxes at https://atlas.hashicorp.com/search.
+ config.vm.box = "ubuntu/xenial64"
+
+ # Disable automatic box update checking. If you disable this, then
+ # boxes will only be checked for updates when the user runs
+ # `vagrant box outdated`. This is not recommended.
+ # config.vm.box_check_update = false
+
+ # Create a forwarded port mapping which allows access to a specific port
+ # within the machine from a port on the host machine. In the example below,
+ # accessing "localhost:8080" will access port 80 on the guest machine.
+ # NOTE: This will enable public access to the opened port
+ config.vm.network "forwarded_port", guest: 80, host: 8080
+ config.vm.network "forwarded_port", guest: 5432, host: 5433
+
+ # Create a forwarded port mapping which allows access to a specific port
+ # within the machine from a port on the host machine and only allow access
+ # via 127.0.0.1 to disable public access
+ # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip:
"127.0.0.1"
+
+ # Create a private network, which allows host-only access to the machine
+ # using a specific IP.
+ # config.vm.network "private_network", ip: "192.168.33.10"
+
+ # Create a public network, which generally matched to bridged network.
+ # Bridged networks make the machine appear as another physical device on
+ # your network.
+ # config.vm.network "public_network"
+
+ # Share an additional folder to the guest VM. The first argument is
+ # the path on the host to the actual folder. The second argument is
+ # the path on the guest to mount the folder. And the optional third
+ # argument is a set of non-required options.
+ # config.vm.synced_folder "../data", "/vagrant_data"
+
+ # Provider-specific configuration so you can fine-tune various
+ # backing providers for Vagrant. These expose provider-specific options.
+ # Example for VirtualBox:
+ #
+ config.vm.provider "virtualbox" do |vb|
+ # # Display the VirtualBox GUI when booting the machine
+ vb.gui = true
+ #
+ # # Customize the amount of memory on the VM:
+ vb.memory = "1024"
+ end
+ #
+ # View the documentation for the provider you are using for more
+ # information on available options.
+
+ # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+ # such as FTP and Heroku are also available. See the documentation at
+ # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+ # config.push.define "atlas" do |push|
+ # push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+ # end
+
+ # Enable provisioning with a shell script. Additional provisioners such as
+ # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+ # documentation for more information about their specific syntax and use.
+ config.vm.provision "shell", inline: <<-SHELL
+ sudo apt-get update
+ sudo apt-get install -y apt-utils
+ sudo apt-get install -y apache2
+ sudo apt-get install -y mysql-client-core-5.7
+ sudo apt-get install -y libapache2-mod-php7.0 php7.0 php7.0-curl
php7.0-intl php7.0-mysql php-xdebug php-apcu php7.0-dev php7.0-xmlrpc
php7.0-xsl php7.0-sybase php7.0-pgsql php7.0-json php7.0-gd php-imagick
php7.0-imap php7.0-soap php7.0-zip php7.0-mbstring php-pear libaio1 locales
+ sudo apt-get install -y git
+ sudo apt-get install -y less vim-tiny
+ sudo apt-get install -y apg
+ sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/
`lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
+ wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | sudo
apt-key add -
+ sudo apt-get update
+ sudo apt-get install -y postgresql postgresql-contrib
+
+ # fix permissions
+ echo "-------------------- fixing listen_addresses on postgresql.conf"
+ sudo sed -i "s/#listen_address.*/listen_addresses '*'/"
/etc/postgresql/9.6/main/postgresql.conf
+ echo "-------------------- fixing postgres pg_hba.conf file"
+ # replace the ipv4 host line with the above line
+
+ sudo cat >> /etc/postgresql/9.6/main/pg_hba.conf <<EOF
+ # Accept all IPv4 connections - FOR DEVELOPMENT ONLY!!!
+ host all all 0.0.0.0/0 md5
+EOF
+
+ echo "-------------------- creating postgres vagrant role with password
vagrant"
+ # Create Role and login
+
+ sudo su postgres -c 'psql -c "CREATE ROLE vagrant SUPERUSER LOGIN PASSWORD
'"'"'vagrant'"'"'" '
+ sudo su postgres -c 'psql -c "CREATE ROLE portico SUPERUSER LOGIN PASSWORD
'"'"'portico'"'"'" '
+ sudo apt install -y whois
+ sudo useradd -p `mkpasswd "portico"` -d /home/"portico" -m -g users -s
/bin/bash "portico"
+ sudo echo 'portico ALL=(ALL:ALL) ALL' >> /etc/sudoers
+
+ sudo apt-get upgrade -y
+
+ sudo sed -i 's/"GP"/"GPCS"/' /etc/php/7.0/apache2/php.ini
+ sudo sed -i 's/"GP"/"GPCS"/' /etc/php/7.0/cli/php.ini
+
+ sudo cat > /etc/php/7.0/apache2/conf.d/91-app.ini <<EOF
+xdebug.max_nesting_level=200
+xdebug.overload_var_dump=Off
+xdebug.remote_autostart=Off
+xdebug.remote_connect_back=On
+xdebug.remote_enable=On
+xdebug.remote_port=9000
+session.cookie_secure=Off
+session.use_cookies=On
+session.use_only_cookies=On
+short_open_tag=Off
+request_order = "GPCS"
+variables_order = "GPCS"
+memory_limit = 5048M
+max_input_vars = 5000
+error_reporting = E_ALL & ~E_NOTICE
+display_errors = On
+post_max_size = 20M
+upload_max_filesize = 8M
+EOF
+
+ sudo cp /etc/php/7.0/apache2/conf.d/91-app.ini
/etc/php/7.0/cli/conf.d/91-app.ini
+
+ sudo service postgresql restart
+ sudo service apache2 restart
+ SHELL
+
+end
Modified:
branches/Version-2_0-branch/property/inc/class.sogeneric_document.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sogeneric_document.inc.php
2017-06-08 17:36:29 UTC (rev 16854)
+++ branches/Version-2_0-branch/property/inc/class.sogeneric_document.inc.php
2017-06-08 17:38:06 UTC (rev 16855)
@@ -91,10 +91,12 @@
if ($location_id)
{
- $joinmethod .= " {$this->join}
phpgw_vfs_file_relation c ON ( a.file_id = c.file_id )";
$filtermethod .= " AND c.location_id =
{$location_id}";
}
-
+ $joinmethod .= " {$this->left_join}
phpgw_vfs_file_relation c ON ( a.file_id = c.file_id )";
+ $joinmethod .= " {$this->left_join} fm_entity_category
ON ( c.location_id = fm_entity_category.location_id )";
+
+
if($location_item_id)
{
$filtermethod .= " AND c.location_item_id =
{$location_item_id}";
@@ -128,7 +130,8 @@
{
$query = $this->db->db_addslashes($query);
$querymethod = " AND (a.name $this->like
'%{$query}%'";
- $querymethod .= " OR metadata->>'path' ilike
'%{$query}%')";
+ $querymethod .= " OR metadata->>'path' ilike
'%{$query}%'";
+ $querymethod .= " OR fm_entity_category.name
ilike '%{$query}%')";
}
$sql = "SELECT DISTINCT a.file_id, a.*,
metadata->>'path' as path FROM phpgw_vfs a " ." {$joinmethod} "."
{$filtermethod} "." {$querymethod} ";
@@ -148,12 +151,14 @@
$this->db->query($sql . $ordermethod,
__LINE__, __FILE__);
}
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
-
+ $ids = array();
while ($this->db->next_record())
{
+ $id = $this->db->f('file_id');
+ $ids[] = $id;
$values[] = array
(
- 'id' => $this->db->f('file_id'),
+ 'id' => $id,
'owner_id' =>
$this->db->f('owner_id'),
'createdby_id' =>
$this->db->f('createdby_id'),
'modifiedby_id' =>
$this->db->f('modifiedby_id'),
@@ -170,6 +175,24 @@
'path' =>
$this->db->f('path'),
);
}
+
+ $locations= array();
+ if($ids)
+ {
+ $sql = "SELECT file_id,
fm_entity_category.name as location_name"
+ . " FROM fm_entity_category
{$this->join} phpgw_vfs_file_relation ON fm_entity_category.location_id =
phpgw_vfs_file_relation.location_id"
+ . " WHERE file_id IN (" .
implode(',', $ids) . ')';
+ $this->db->query($sql, __LINE__,
__FILE__);
+ while ($this->db->next_record())
+ {
+
$locations[$this->db->f('file_id')][] = $this->db->f('location_name');
+ }
+
+ foreach ($values as & $entry)
+ {
+ $entry['location_names'] =
array_unique((array)$locations[$entry['id']]);
+ }
+ }
}
return $values;
Modified: branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
2017-06-08 17:36:29 UTC (rev 16854)
+++ branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
2017-06-08 17:38:06 UTC (rev 16855)
@@ -1725,7 +1725,7 @@
if($item['path'])
{
$temp = json_decode($item['path']);
- $title = implode('<br/>', $temp);
+ $title = implode('<br/>',
array_merge($item['location_names'],$temp));
}
$document_name = '<a
href="'.self::link(array('menuaction'=>'property.uigeneric_document.view_file',
'file_id'=>$item['id'])).'" target="_blank">'.$item['name'].'</a>';
@@ -2163,7 +2163,7 @@
$documents_def = array(
array('key' => 'id', 'label' =>
lang('id'), 'sortable' => false, 'resizeable' => true),
array('key' => 'document_name',
'label' => lang('name'), 'sortable' => true, 'resizeable' => true),
- array('key' => 'title', 'label'
=> lang('title'), 'sortable' => true, 'resizeable' => true),
+ array('key' => 'title', 'label'
=> 'Info', 'sortable' => true, 'resizeable' => true),
array('key' => 'document_date',
'label' => lang('date'), 'sortable' => true, 'resizeable' => true),
);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16855] Stable: Merge 16852:16854 from trunk,
sigurdne <=