[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12865] api: file integration
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12865] api: file integration |
|
Date: |
Mon, 16 Mar 2015 14:45:34 +0000 |
Revision: 12865
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12865
Author: sigurdne
Date: 2015-03-16 14:45:34 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
api: file integration
Modified Paths:
--------------
trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
trunk/property/inc/class.uientity.inc.php
trunk/property/templates/base/entity.xsl
trunk/setup/index.php
trunk/setup/templates/base/setup_main.tpl
Modified: trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php 2015-03-16
14:43:24 UTC (rev 12864)
+++ trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php 2015-03-16
14:45:34 UTC (rev 12865)
@@ -67,8 +67,20 @@
$options[Bra5WsdlClass::WSDL_TRACE] = false;
$options[Bra5WsdlClass::WSDL_SOAP_VERSION] = SOAP_1_2;
- $wsdlObject = new Bra5WsdlClass($options);
+ try
+ {
+ $wsdlObject = new Bra5WsdlClass($options);
+ }
+ catch(Exception $e)
+ {
+ if($e)
+ {
+
phpgwapi_cache::message_set($e->getMessage(), 'error');
+ return false;
+ }
+ }
+
$bra5ServiceLogin = new Bra5ServiceLogin();
if($bra5ServiceLogin->Login(new
Bra5StructLogin($braarkiv_user,$braarkiv_pass)))
{
Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php 2015-03-16 14:43:24 UTC (rev
12864)
+++ trunk/property/inc/class.uientity.inc.php 2015-03-16 14:45:34 UTC (rev
12865)
@@ -2525,9 +2525,16 @@
$GLOBALS['phpgw']->js->add_code('',
$_autocomplete);
}
+ $repeat_types = array();
+ $repeat_types[] = array('id'=> -1, 'name' =>
lang('day'));
+ $repeat_types[] = array('id'=> 1, 'name' =>
lang('weekly'));
+ $repeat_types[] = array('id'=> 2, 'name' =>
lang('month'));
+ $repeat_types[] = array('id'=> 3, 'name' =>
lang('year'));
+
$data = array
(
- 'controller'
=> true,
+ 'repeat_types'
=> array('options' => $repeat_types),
+ 'controller'
=> true,
'property_js'
=> json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] .
$property_js),
'datatable'
=> $datavalues,
'myColumnDefs'
=> $myColumnDefs,
Modified: trunk/property/templates/base/entity.xsl
===================================================================
--- trunk/property/templates/base/entity.xsl 2015-03-16 14:43:24 UTC (rev
12864)
+++ trunk/property/templates/base/entity.xsl 2015-03-16 14:45:34 UTC (rev
12865)
@@ -736,10 +736,43 @@
<label>
<xsl:value-of select="php:function('lang', 'start date')" />
</label>
+
<input
type="text" name="control_start_date" id="control_start_date" value=""
readonly="readonly" size="10">
</input>
<br/>
+ <label>
+
<xsl:value-of select="php:function('lang', 'repeat type')" />
+ </label>
+ <select
id="repeat_type" name="repeat_type">
+ <option
value=""><xsl:value-of select="php:function('lang', 'select')"/></option>
+
<xsl:apply-templates select="repeat_types/options"/>
+ </select>
+ <br/>
+
+ <label>
+
<xsl:value-of select="php:function('lang', 'interval')" />
+ </label>
+ <input
type="text" name="repeat_interval" id="repeat_interval" value="1" size="2">
+ </input>
+
+ <br/>
+
+ <label>
+
<xsl:value-of select="php:function('lang', 'controle time')" />
+ </label>
+ <input
type="text" name="controle_time" id="controle_time" value="" size="">
+ </input>
+ <br/>
+
+ <label>
+
<xsl:value-of select="php:function('lang', 'service time')" />
+ </label>
+ <input
type="text" name="service_time" id="service_time" value="" size="">
+ </input>
+
+ <br/>
+
<input
type="button" name="" value="{$lang_add}" title="{$lang_add}"
onClick="add_control();">
</input>
Modified: trunk/setup/index.php
===================================================================
--- trunk/setup/index.php 2015-03-16 14:43:24 UTC (rev 12864)
+++ trunk/setup/index.php 2015-03-16 14:45:34 UTC (rev 12865)
@@ -42,12 +42,17 @@
'T_login_main' => 'login_main.tpl',
'T_login_stage_header' => 'login_stage_header.tpl',
'T_setup_main' => 'setup_main.tpl',
- 'T_setup_db_blocks' => 'setup_db_blocks.tpl'
+ 'T_setup_db_blocks' => 'setup_db_blocks.tpl',
+ 'T_setup_svn_blocks' => 'setup_svn_blocks.tpl',
+
));
$setup_tpl->set_block('T_login_stage_header','B_multi_domain','V_multi_domain');
$setup_tpl->set_block('T_login_stage_header','B_single_domain','V_single_domain');
+
$setup_tpl->set_block('T_setup_svn_blocks','B_svn_stage_1','V_svn_stage_1');
+
$setup_tpl->set_block('T_setup_svn_blocks','B_svn_stage_2','V_svn_stage_2');
+
$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_1','V_db_stage_1');
$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_2','V_db_stage_2');
$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_3','V_db_stage_3');
@@ -100,7 +105,30 @@
//$GLOBALS['phpgw_info']['setup']['stage']['db'] = 0;
//$action = 'Upgrade';
// end DEBUG code
+ /**
+ * Update code from SVN
+ */
+ $subtitle = '';
+ $submsg = '';
+ $subaction = '';
+ $GLOBALS['phpgw_info']['setup']['stage']['svn'] = 1;//default
+ switch( phpgw::get_var('action_svn') )
+ {
+ case 'check_for_svn_update':
+ $subtitle = lang('check for update');
+ $submsg = lang('At your request, this script is going
to attempt to check for updates from the svn server');
+
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] =
'check_for_svn_update';
+ $GLOBALS['phpgw_info']['setup']['stage']['svn'] = 2;
+ break;
+ case 'perform_svn_update':
+ $subtitle = lang('uppdating code');
+ $submsg = lang('At your request, this script is going
to attempt updating the system from the svn server') . '.';
+
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] =
'perform_svn_update';
+ $GLOBALS['phpgw_info']['setup']['stage']['svn'] = 1; //
alternate
+ break;
+ }
+
$subtitle = '';
$submsg = '';
$subaction = '';
@@ -167,8 +195,49 @@
$setup_tpl->set_var('img_incomplete', $incomplete);
$setup_tpl->set_var('img_completed', $completed);
+ $setup_tpl->set_var('svn_step_text',lang('Step 0 - check for updates'));
$setup_tpl->set_var('db_step_text',lang('Step 1 - Simple Application
Management'));
+ switch($GLOBALS['phpgw_info']['setup']['stage']['svn'])
+ {
+ case 1:
+ $setup_tpl->set_var('dry_run',lang('show-updates'));
+ $setup_tpl->set_var('svnwarn',lang('will try to perform
a svn status'));
+ $setup_tpl->set_var('check_for_svn_update',lang('check
update'));
+ $_svn_message = '';
+
if($GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] ==
'perform_svn_update')
+ {
+ putenv('LANG=en_US.UTF-8');
+ exec('svn up ' . PHPGW_SERVER_ROOT . '
--config-dir /etc/subversion 2>&1', $output, $returnStatus);
+ $_svn_message = '<pre>' . print_r($output,true)
. '</pre>';
+ }
+ $setup_tpl->set_var('svn_message',$_svn_message);
+ $setup_tpl->parse('V_svn_stage_1','B_svn_stage_1');
+ $svn_filled_block =
$setup_tpl->get_var('V_svn_stage_1');
+
$setup_tpl->set_var('V_svn_filled_block',$svn_filled_block);
+
+ break;
+ case 2:
+ $setup_tpl->set_var('perform_svn_update',lang('perform
svn update'));
+ $setup_tpl->set_var('execute',lang('execute'));
+ $setup_tpl->set_var('svnwarn',lang('will try to perform
a svn up'));
+ $_svn_message = '';
+
if($GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] ==
'check_for_svn_update')
+ {
+ putenv('LANG=en_US.UTF-8');
+ exec('svn status -u ' . PHPGW_SERVER_ROOT . '
--config-dir /etc/subversion 2>&1', $output, $returnStatus);
+ $_svn_message = '<pre>' . print_r($output,true)
. '</pre>';
+ }
+ $setup_tpl->set_var('svn_message',$_svn_message);
+ $setup_tpl->parse('V_svn_stage_2','B_svn_stage_2');
+ $svn_filled_block =
$setup_tpl->get_var('V_svn_stage_2');
+
$setup_tpl->set_var('V_svn_filled_block',$svn_filled_block);
+
+ break;
+ default:
+ // 1 is default
+ }
+
switch($GLOBALS['phpgw_info']['setup']['stage']['db'])
{
case 1:
Modified: trunk/setup/templates/base/setup_main.tpl
===================================================================
--- trunk/setup/templates/base/setup_main.tpl 2015-03-16 14:43:24 UTC (rev
12864)
+++ trunk/setup/templates/base/setup_main.tpl 2015-03-16 14:45:34 UTC (rev
12865)
@@ -1,6 +1,15 @@
<!-- begin setup_main.tpl -->
+<!-- begin the svn section -->
+<table border="0" width="100%" cellspacing="0" cellpadding="2" style="{border:
1px solid #000000;}">
+<tr class="th">
+ <td align="left">{svn_step_text}</td>
+ <td align="right"> </td>
+</tr>
+
+{V_svn_filled_block}
+<!-- end the svn section -->
+
<!-- begin the db section -->
-<table border="0" width="100%" cellspacing="0" cellpadding="2" style="{
border: 1px solid #000000; }">
<tr class="th">
<td align="left">{db_step_text}</td>
<td align="right"> </td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12865] api: file integration,
Sigurd Nes <=