[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17341] Stable: Merge 17334:17340 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17341] Stable: Merge 17334:17340 from trunk |
|
Date: |
Tue, 21 Nov 2017 07:42:38 -0500 (EST) |
Revision: 17341
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17341
Author: sigurdne
Date: 2017-11-21 07:42:37 -0500 (Tue, 21 Nov 2017)
Log Message:
-----------
Stable: Merge 17334:17340 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-2_0-branch/controller/js/controller/check_list.js
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
branches/Version-2_0-branch/frontend/inc/class.bofrontend.inc.php
branches/Version-2_0-branch/frontend/inc/class.uidelegates.inc.php
branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-11-21 12:41:18 UTC (rev 17340)
+++ branches/Version-2_0-branch 2017-11-21 12:42:37 UTC (rev 17341)
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,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333
\ 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,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340
\ No newline at end of property
Modified: branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
2017-11-21 12:41:18 UTC (rev 17340)
+++ branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
2017-11-21 12:42:37 UTC (rev 17341)
@@ -70,7 +70,11 @@
'view_control_items' => true,
'get_check_list_info' => true,
'get_cases_for_check_list' => true,
- 'update_status' => true
+ 'update_status' => true,
+ 'build_multi_upload_file' => true,
+ 'handle_multi_upload_file' => true,
+ 'get_files3' => true,
+ 'view_file' => true
);
function __construct()
@@ -435,7 +439,7 @@
$check_list_id =
phpgw::get_var('check_list_id');
$check_list =
$this->so->get_single($check_list_id);
}
-
+
$current_time = time();
$absolute_deadline = time() + (14 * 24 * 60 * 60);
$check_list_locked = false;
@@ -442,7 +446,9 @@
if($check_list->get_deadline() < $absolute_deadline)
{
//check list was due two weeks ago, and is
locked
- $check_list_locked = true;
+ //FIXME - funkar inte
+ //Eksempel: frist 30/11/2017, dagens dato
20/11/2017, absolutt frist blir 4/12/2017...
+// $check_list_locked = true;
}
// echo 'tid: '.$current_time.'abs: '.$absolute_deadline;
@@ -549,6 +555,25 @@
$required_actual_hours =
isset($config->config_data['required_actual_hours']) &&
$config->config_data['required_actual_hours'] ?
$config->config_data['required_actual_hours'] : false;
+ $file_def = array
+ (
+ array('key' => 'file_name', 'label' =>
lang('Filename'), 'sortable' => false,'resizeable' => true),
+ array('key' => 'picture', 'label' => '',
'sortable' => false,'resizeable' => false, 'formatter' =>
'JqueryPortico.showPicture')
+ );
+
+ $datatable_def[] = array
+ (
+ 'container' => 'datatable-container_0',
+ 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"controller.uicheck_list.get_files3",
+ 'id' => $check_list_id,
'phpgw_return_as' => 'json'))),
+ 'ColumnDefs' => $file_def,
+ 'data' => json_encode(array()),
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' => true)
+ )
+ );
+
$data = array
(
'user_list' => array('options' =>
$user_list_options),
@@ -566,7 +591,11 @@
'building_location_code' =>
$building_location_code,
'location_level' => $level,
'required_actual_hours' =>
$required_actual_hours,
- 'integration' =>
$this->_get_component_integration($location_id, $component_arr)
+ 'integration' =>
$this->_get_component_integration($location_id, $component_arr),
+ 'datatable_def' => $datatable_def,
+ 'multiple_uploader' => true,
+ 'multi_upload_parans' =>
"{menuaction:'controller.uicheck_list.build_multi_upload_file',
id:'{$check_list_id}'}",
+
);
$GLOBALS['phpgw']->jqcal->add_listener('planned_date');
@@ -579,9 +608,202 @@
self::render_template_xsl(array('check_list/fragments/check_list_menu',
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section',
'check_list/edit_check_list',
-
'check_list/fragments/select_buildings_on_property'), $data);
+
'check_list/fragments/select_buildings_on_property',
'files','datatable_inline'), $data);
}
+ public function view_file()
+ {
+ $GLOBALS['phpgw_info']['flags']['noheader'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+
+ if (!$this->read)
+ {
+ phpgw::no_access();
+ }
+
+ $thumb = phpgw::get_var('thumb', 'bool');
+ $file_id = phpgw::get_var('file_id', 'int');
+
+ $bofiles = CreateObject('property.bofiles');
+
+ if($file_id)
+ {
+ $file_info = $bofiles->vfs->get_info($file_id);
+ $file =
"{$file_info['directory']}/{$file_info['name']}";
+ }
+ else
+ {
+ $file = urldecode(phpgw::get_var('file'));
+ }
+
+ $source = "{$bofiles->rootdir}{$file}";
+ $thumbfile = "$source.thumb";
+
+ // prevent path traversal
+ if (preg_match('/\.\./', $source))
+ {
+ return false;
+ }
+
+ $uigallery = CreateObject('property.uigallery');
+
+ $re_create = false;
+ if ($uigallery->is_image($source) && $thumb &&
$re_create)
+ {
+ $uigallery->create_thumb($source, $thumbfile,
$thumb_size = 50);
+ readfile($thumbfile);
+ }
+ else if ($thumb && is_file($thumbfile))
+ {
+ readfile($thumbfile);
+ }
+ else if ($uigallery->is_image($source) && $thumb)
+ {
+ $uigallery->create_thumb($source, $thumbfile,
$thumb_size = 50);
+ readfile($thumbfile);
+ }
+ else if ($file_id)
+ {
+ $bofiles->get_file($file_id);
+ }
+ else
+ {
+ $bofiles->view_file('', $file);
+ }
+ }
+
+ function get_files3()
+ {
+ $id = phpgw::get_var('id', 'int');
+
+ if (empty($this->read))
+ {
+ return array();
+ }
+
+ $link_file_data = array
+ (
+ 'menuaction' =>
"controller.uicheck_list.view_file",
+ );
+
+
+ $link_view_file = $GLOBALS['phpgw']->link('/index.php',
$link_file_data);
+
+ $vfs = CreateObject('phpgwapi.vfs');
+ $vfs->override_acl = 1;
+
+ $files = $vfs->ls(array(
+ 'string' => "/controller/check_list/{$id}",
+ 'relatives' => array(RELATIVE_NONE)));
+
+ $vfs->override_acl = 0;
+
+ $img_types = array(
+ 'image/jpeg',
+ 'image/png',
+ 'image/gif'
+ );
+
+ $content_files = array();
+
+ $z = 0;
+ foreach ($files as $_entry)
+ {
+
+ $content_files[] = array(
+ 'file_name' => '<a href="' .
$link_view_file . '&file_id=' . $_entry['file_id'] . '" target="_blank"
title="' . lang('click to view file') . '">' . $_entry['name'] . '</a>',
+ 'delete_file' => '<input
type="checkbox" name="values[file_action][]" value="' . $_entry['file_id'] . '"
title="' . lang('Check to delete file') . '">',
+ );
+ if ( in_array($_entry['mime_type'], $img_types))
+ {
+ $content_files[$z]['file_name'] =
$_entry['name'];
+ $content_files[$z]['img_id'] =
$_entry['file_id'];
+ $content_files[$z]['img_url'] =
self::link(array(
+ 'menuaction' =>
"controller.uicheck_list.view_file",
+ 'file_id' =>
$_entry['file_id'],
+ 'file' =>
$_entry['directory'] . '/' . urlencode($_entry['name'])
+ ));
+ $content_files[$z]['thumbnail_flag'] =
'thumb=1';
+ }
+ $z ++;
+ }
+
+ if (phpgw::get_var('phpgw_return_as') == 'json')
+ {
+
+ $total_records = count($content_files);
+
+ return array
+ (
+ 'data' => $content_files,
+ 'draw' => phpgw::get_var('draw', 'int'),
+ 'recordsTotal' => $total_records,
+ 'recordsFiltered' => $total_records
+ );
+ }
+ return $content_files;
+ }
+ public function handle_multi_upload_file()
+ {
+ if (!$this->add)
+ {
+ phpgw::no_access();
+ }
+
+ $id = phpgw::get_var('id', 'int');
+
+ phpgw::import_class('property.multiuploader');
+
+ $options['fakebase'] = "/controller";
+ $options['base_dir'] = "check_list/{$id}";
+ $options['upload_dir'] =
$GLOBALS['phpgw_info']['server']['files_dir'].'/controller/'.$options['base_dir'].'/';
+ $options['script_url'] =
html_entity_decode(self::link(array('menuaction' =>
"controller.uicheck_list.handle_multi_upload_file", 'id' => $id)));
+ $upload_handler = new property_multiuploader($options,
false);
+
+ switch ($_SERVER['REQUEST_METHOD']) {
+ case 'OPTIONS':
+ case 'HEAD':
+ $upload_handler->head();
+ break;
+ case 'GET':
+ $upload_handler->get();
+ break;
+ case 'PATCH':
+ case 'PUT':
+ case 'POST':
+ $upload_handler->add_file();
+ break;
+ case 'DELETE':
+ $upload_handler->delete_file();
+ break;
+ default:
+ $upload_handler->header('HTTP/1.1 405
Method Not Allowed');
+ }
+
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
+
+ public function build_multi_upload_file()
+ {
+ phpgwapi_jquery::init_multi_upload_file();
+ $id = phpgw::get_var('id', 'int');
+
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+
+ $multi_upload_action = self::link(array('menuaction' =>
"controller.uicheck_list.handle_multi_upload_file", 'id' => $id));
+
+ $data = array
+ (
+ 'multi_upload_action' => $multi_upload_action
+ );
+
+ $GLOBALS['phpgw']->xslttpl->add_file(array('files',
'multi_upload_file'));
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('multi_upload' => $data));
+ }
+
/**
* Get linked information from external systems - as pictures
* @param integer $location_id
Modified: branches/Version-2_0-branch/controller/js/controller/check_list.js
===================================================================
--- branches/Version-2_0-branch/controller/js/controller/check_list.js
2017-11-21 12:41:18 UTC (rev 17340)
+++ branches/Version-2_0-branch/controller/js/controller/check_list.js
2017-11-21 12:42:37 UTC (rev 17341)
@@ -82,3 +82,20 @@
}
});
});
+
+this.fileuploader = function ()
+{
+ var sUrl = phpGWLink('index.php', multi_upload_parans);
+ TINY.box.show({iframe: sUrl, boxid: 'frameless', width: 750, height:
450, fixed: false, maskid: 'darkmask', maskopacity: 40, mask: true, animate:
true,
+ close: true,
+ closejs: function ()
+ {
+ refresh_files()
+ }
+ });
+};
+
+this.refresh_files = function ()
+{
+ JqueryPortico.updateinlineTableHelper('datatable-container_0');
+};
Modified:
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2017-11-21 12:41:18 UTC (rev 17340)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2017-11-21 12:42:37 UTC (rev 17341)
@@ -1,159 +1,204 @@
<!-- $Id$ -->
<xsl:template match="data" name="edit_check_list"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
-<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+ <xsl:variable name="date_format">
+ <xsl:value-of select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')" />
+ </xsl:variable>
+ <xsl:variable name="session_url">
+ <xsl:text>&</xsl:text>
+ <xsl:value-of select="php:function('get_phpgw_session_url')" />
+ </xsl:variable>
-<div id="main_content" class="medium">
+ <div id="main_content" class="medium">
- <xsl:call-template name="check_list_top_section">
- <xsl:with-param name="active_tab">view_details</xsl:with-param>
- </xsl:call-template>
+ <xsl:call-template name="check_list_top_section">
+ <xsl:with-param
name="active_tab">view_details</xsl:with-param>
+ </xsl:call-template>
- <!-- ================== CHECKLIST DETAILS ===================== -->
- <div id="check_list_details">
- <h3 class="box_header">Sjekklistedetaljer::<xsl:value-of
select="current_month_name"/></h3>
- <xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicheck_list.save_check_list')" /></xsl:variable>
+ <!-- ================== CHECKLIST DETAILS
===================== -->
+ <div id="check_list_details">
+ <h3
class="box_header">Sjekklistedetaljer::<xsl:value-of
select="current_month_name"/></h3>
+ <xsl:variable name="action_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicheck_list.save_check_list')" />
+ </xsl:variable>
<form id="frm_update_check_list" action="{$action_url}"
method="post">
- <xsl:variable name="check_list_id"><xsl:value-of
select="check_list/id"/></xsl:variable>
- <input id="check_list_id" type="hidden"
name="check_list_id" value="{$check_list_id}" />
- <xsl:if test="check_list_locked = '1'">
- <div class='input_error_msg'>
- <xsl:value-of
select="php:function('lang', 'error_msg_control_passed_due_date')" />
- </div>
- </xsl:if>
- <fieldset class="col_1">
- <div class="row">
- <label>Status</label>
- <xsl:variable name="status"><xsl:value-of
select="check_list/status"/></xsl:variable>
- <select id="status" name="status">
- <xsl:choose>
- <xsl:when
test="check_list/status = 0">
- <option
value="1">Utført</option>
- <option
value="0" SELECTED="SELECTED">Ikke utført</option>
- <option value="3">Kansellert</option>
- </xsl:when>
- <xsl:when
test="check_list/status = 1">
- <option
value="1" SELECTED="SELECTED">Utført</option>
- <option
value="0">Ikke utført</option>
- <option value="3">Kansellert</option>
- </xsl:when>
- <xsl:when test="check_list/status = 3">
- <option
value="3" SELECTED="SELECTED">Kansellert</option>
- <option
value="0">Ikke utført</option>
- <option value="1">Utført</option>
- </xsl:when>
- <xsl:otherwise>
- <option
value="0" SELECTED="SELECTED">Ikke utført</option>
- <option
value="1">Utført</option>
- <option value="3">Kansellert</option>
- </xsl:otherwise>
- </xsl:choose>
- </select>
- </div>
- <div class="row">
- <label>Skal utføres innen</label>
- <xsl:value-of select="php:function('date',
$date_format, number(check_list/deadline))"/>
- <input id="deadline_date" name="deadline_date"
type="hidden">
- <xsl:if test="check_list/deadline != 0 or
check_list/deadline != ''">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/deadline))"/></xsl:attribute>
- </xsl:if>
- </input>
- <input type="hidden"
id="original_deadline_date" name="original_deadline_date" >
- <xsl:attribute name="value">
- <xsl:value-of
select="check_list/original_deadline"/>
- </xsl:attribute>
- </input>
- </div>
- <div class="row">
- <xsl:if
test="check_list/error_msg_array/planned_date != ''">
- <xsl:variable name="error_msg">
- <xsl:value-of
select="check_list/error_msg_array/planned_date" />
- </xsl:variable>
+ <xsl:variable name="check_list_id">
+ <xsl:value-of select="check_list/id"/>
+ </xsl:variable>
+ <input id="check_list_id" type="hidden"
name="check_list_id" value="{$check_list_id}" />
+ <xsl:if test="check_list_locked = '1'">
<div class='input_error_msg'>
- <xsl:value-of
select="php:function('lang', $error_msg)" />
+ <xsl:value-of
select="php:function('lang', 'error_msg_control_passed_due_date')" />
</div>
</xsl:if>
- <label>Planlagt dato</label>
- <input class="date" readonly="readonly">
- <xsl:attribute
name="id">planned_date</xsl:attribute>
- <xsl:attribute
name="name">planned_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/planned_date != 0 and
check_list/planned_date != ''">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/planned_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- <div class="row">
- <xsl:if
test="check_list/error_msg_array/completed_date != ''">
- <xsl:variable name="error_msg">
- <xsl:value-of
select="check_list/error_msg_array/completed_date" />
- </xsl:variable>
- <div class='input_error_msg'>
- <xsl:value-of
select="php:function('lang', $error_msg)" />
+ <fieldset class="col_1">
+ <div class="row">
+ <label>Status</label>
+ <xsl:variable name="status">
+ <xsl:value-of
select="check_list/status"/>
+ </xsl:variable>
+ <select id="status"
name="status">
+ <xsl:choose>
+ <xsl:when
test="check_list/status = 0">
+ <option
value="1">Utført</option>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:when>
+ <xsl:when
test="check_list/status = 1">
+ <option
value="1" SELECTED="SELECTED">Utført</option>
+ <option
value="0">Ikke utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:when>
+ <xsl:when
test="check_list/status = 3">
+ <option
value="3" SELECTED="SELECTED">Kansellert</option>
+ <option
value="0">Ikke utført</option>
+ <option
value="1">Utført</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option
value="1">Utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
</div>
- </xsl:if>
- <label>Utført dato</label>
- <input class="date" >
- <xsl:attribute
name="id">completed_date</xsl:attribute>
- <xsl:attribute
name="name">completed_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/completed_date != 0
and check_list/completed_date != ''">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/completed_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- <!-- ASSIGNMET -->
- <div class="row">
- <label>Tildelt</label>
- <select name="assigned_to">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'select')"/>
- </xsl:attribute>
- <option value="0">
- <xsl:value-of
select="php:function('lang', 'select')"/>
- </option>
- <xsl:apply-templates
select="user_list/options"/>
- </select>
- </div>
- <xsl:if test="required_actual_hours = 1">
<div class="row">
- <label>Egne Timer</label>
- <input class="date">
- <xsl:attribute
name="id">billable_hours</xsl:attribute>
- <xsl:attribute
name="name">billable_hours</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
+ <label>Skal utføres
innen</label>
+ <xsl:value-of
select="php:function('date', $date_format, number(check_list/deadline))"/>
+ <input id="deadline_date"
name="deadline_date" type="hidden">
+ <xsl:if
test="check_list/deadline != 0 or check_list/deadline != ''">
+ <xsl:attribute
name="value">
+
<xsl:value-of select="php:function('date', $date_format,
number(check_list/deadline))"/>
+ </xsl:attribute>
+ </xsl:if>
</input>
- <xsl:text> </xsl:text>
- <xsl:value-of
select="check_list/billable_hours"/>
+ <input type="hidden"
id="original_deadline_date" name="original_deadline_date" >
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="check_list/original_deadline"/>
+ </xsl:attribute>
+ </input>
</div>
- </xsl:if>
- </fieldset>
- <fieldset class="col_2">
- <div class="row">
- <label>Antall åpne saker</label>
- <xsl:value-of
select="check_list/num_open_cases"/>
- </div>
- <div class="row">
- <label>Antall ventende saker</label>
- <xsl:value-of
select="check_list/num_pending_cases"/>
- </div>
- </fieldset>
+ <div class="row">
+ <xsl:if
test="check_list/error_msg_array/planned_date != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/planned_date" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <label>Planlagt dato</label>
+ <input class="date"
readonly="readonly">
+ <xsl:attribute
name="id">planned_date</xsl:attribute>
+ <xsl:attribute
name="name">planned_date</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ <xsl:if
test="check_list/planned_date != 0 and check_list/planned_date != ''">
+ <xsl:attribute
name="value">
+
<xsl:value-of select="php:function('date', $date_format,
number(check_list/planned_date))"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <div class="row">
+ <xsl:if
test="check_list/error_msg_array/completed_date != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/completed_date" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <label>Utført dato</label>
+ <input class="date" >
+ <xsl:attribute
name="id">completed_date</xsl:attribute>
+ <xsl:attribute
name="name">completed_date</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ <xsl:if
test="check_list/completed_date != 0 and check_list/completed_date != ''">
+ <xsl:attribute
name="value">
+
<xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <!-- ASSIGNMET -->
+ <div class="row">
+ <label>Tildelt</label>
+ <select name="assigned_to">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </xsl:attribute>
+ <option value="0">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:apply-templates
select="user_list/options"/>
+ </select>
+ </div>
+ <xsl:if test="required_actual_hours =
1">
+ <div class="row">
+ <label>Egne
Timer</label>
+ <input class="date">
+ <xsl:attribute
name="id">billable_hours</xsl:attribute>
+ <xsl:attribute
name="name">billable_hours</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="check_list/billable_hours"/>
+ </div>
+ </xsl:if>
+ </fieldset>
+ <fieldset class="col_2">
+ <div class="row">
+ <label>Antall åpne saker</label>
+ <xsl:value-of
select="check_list/num_open_cases"/>
+ </div>
+ <div class="row">
+ <label>Antall ventende
saker</label>
+ <xsl:value-of
select="check_list/num_pending_cases"/>
+ </div>
+ </fieldset>
- <div class="comment">
- <label>Kommentar</label>
- <textarea>
- <xsl:attribute
name="name">comment</xsl:attribute>
- <xsl:value-of select="check_list/comment"/>
- </textarea>
- </div>
-
- <xsl:if test="check_list_locked != '1'">
- <div class="form-buttons">
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_check_list')"
/></xsl:variable>
- <input class="btn" type="submit"
name="save_control" value="Lagre detaljer" />
+ <div class="comment">
+ <label>Kommentar</label>
+ <textarea>
+ <xsl:attribute
name="name">comment</xsl:attribute>
+ <xsl:value-of
select="check_list/comment"/>
+ </textarea>
</div>
- </xsl:if>
+
+ <div class="comment">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'files')"/>
+ </label>
+ <div class="pure-u pure-custom" >
+ <xsl:for-each
select="datatable_def">
+ <xsl:if test="container
= 'datatable-container_0'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="config" select ='config'/>
+
</xsl:call-template>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ </div>
+ <script type="text/javascript">
+ var multi_upload_parans = <xsl:value-of
select="multi_upload_parans"/>;
+ </script>
+ <div class="comment">
+ <xsl:call-template name="file_upload"/>
+ </div>
+
+ <xsl:if test="check_list_locked != '1'">
+ <div class="form-buttons">
+ <xsl:variable name="lang_save">
+ <xsl:value-of
select="php:function('lang', 'save_check_list')" />
+ </xsl:variable>
+ <input class="btn"
type="submit" name="save_control" value="Lagre detaljer" />
+ </div>
+ </xsl:if>
</form>
</div>
<xsl:for-each select="integration">
@@ -167,12 +212,12 @@
</xsl:template>
- <!-- New template-->
- <xsl:template match="options">
- <option value="{id}">
- <xsl:if test="selected != 0">
- <xsl:attribute name="selected"
value="selected"/>
- </xsl:if>
- <xsl:value-of disable-output-escaping="yes"
select="name"/>
- </option>
- </xsl:template>
+<!-- New template-->
+<xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected != 0">
+ <xsl:attribute name="selected" value="selected"/>
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+</xsl:template>
Modified: branches/Version-2_0-branch/frontend/inc/class.bofrontend.inc.php
===================================================================
--- branches/Version-2_0-branch/frontend/inc/class.bofrontend.inc.php
2017-11-21 12:41:18 UTC (rev 17340)
+++ branches/Version-2_0-branch/frontend/inc/class.bofrontend.inc.php
2017-11-21 12:42:37 UTC (rev 17341)
@@ -207,7 +207,7 @@
{
// The location
$location_id =
$GLOBALS['phpgw']->locations->get_id('frontend', '.');
- ;
+
$owner_id = isset($owner_id) ? $owner_id :
$GLOBALS['phpgw_info']['user']['account_id'];
// If a specific organisational unit is chosen
Modified: branches/Version-2_0-branch/frontend/inc/class.uidelegates.inc.php
===================================================================
--- branches/Version-2_0-branch/frontend/inc/class.uidelegates.inc.php
2017-11-21 12:41:18 UTC (rev 17340)
+++ branches/Version-2_0-branch/frontend/inc/class.uidelegates.inc.php
2017-11-21 12:42:37 UTC (rev 17341)
@@ -69,7 +69,6 @@
$org_units =
frontend_bofellesdata::get_instance()->get_result_units($GLOBALS['phpgw_info']['user']['account_lid']);
//Parameter to delegate access to only
a single organisational unit
$org_unit_id =
$this->header_state['selected_org_unit'];
- $success = true;
foreach ($org_units as $org_unit)
{
@@ -241,7 +240,10 @@
return false;
}
}
- return frontend_bofrontend::add_delegate($account_id,
null, $org_unit_id, $org_name);
+
+ $owner_id = (int)
$GLOBALS['phpgw_info']['user']['account_id'];
+
+ return frontend_bofrontend::add_delegate($account_id,
$owner_id, $org_unit_id, $org_name);
}
public function remove_delegate()
Modified:
branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
2017-11-21 12:41:18 UTC (rev 17340)
+++ branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
2017-11-21 12:42:37 UTC (rev 17341)
@@ -420,12 +420,6 @@
{
$id = isset($values['id']) && $values['id'] ?
$values['id'] : phpgw::get_var('id', 'int');
- if (!$this->acl_add && !$this->acl_edit)
- {
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'property.uicondition_survey.view',
- 'id' => $id));
- }
-
if ($mode == 'view')
{
if (!$this->acl_read)
Modified: branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
2017-11-21 12:41:18 UTC (rev 17340)
+++ branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
2017-11-21 12:42:37 UTC (rev 17341)
@@ -1118,12 +1118,6 @@
{
$id = isset($values['id']) && $values['id'] ?
$values['id'] : phpgw::get_var('id', 'int');
- if (!$this->acl_add && !$this->acl_edit)
- {
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'property.uirequest.view',
- 'id' => $id));
- }
-
if ($mode == 'view')
{
if (!$this->acl_read)
Modified:
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
===================================================================
---
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2017-11-21 12:41:18 UTC (rev 17340)
+++
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2017-11-21 12:42:37 UTC (rev 17341)
@@ -410,7 +410,8 @@
$subject = 'Feil ved oppdatering av
meldinger(bestillinger) fra Agresso';
$from = "Ikke svar<address@hidden>";
$to = "address@hidden";
- $cc = "address@hidden";
+ $cc = "address@hidden";
+ $bcc = "address@hidden";
if ($this->receipt['error'])
{
$errors = array();
@@ -421,7 +422,7 @@
$body = implode("<br/>", $errors);
try
{
- $rc = $this->send->msg('email', $to,
$subject, $body, '', $cc, '', $from, '', 'html');
+ $rc = $this->send->msg('email', $to,
$subject, $body, '', $cc, $bcc, $from, '', 'html');
}
catch (phpmailerException $e)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17341] Stable: Merge 17334:17340 from trunk,
sigurdne <=