[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16407] Stable: Merge 16405:16406 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16407] Stable: Merge 16405:16406 from trunk |
|
Date: |
Tue, 7 Mar 2017 09:06:34 -0500 (EST) |
Revision: 16407
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16407
Author: sigurdne
Date: 2017-03-07 09:06:34 -0500 (Tue, 07 Mar 2017)
Log Message:
-----------
Stable: Merge 16405:16406 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uivendor.inc.php
branches/Version-2_0-branch/eventplanner/templates/base/vendor.xsl
branches/Version-2_0-branch/eventplannerfrontend/logout.php
branches/Version-2_0-branch/eventplannerfrontend/templates/base/vendor.xsl
branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-03-07 14:04:59 UTC (rev 16406)
+++ branches/Version-2_0-branch 2017-03-07 14:06:34 UTC (rev 16407)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16394
/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
\ 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
\ No newline at end of property
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-03-07 14:04:59 UTC (rev 16406)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-03-07 14:06:34 UTC (rev 16407)
@@ -225,6 +225,20 @@
$id = !empty($values['id']) ? $values['id'] :
phpgw::get_var('id', 'int');
$application = $this->bo->read_single($id);
}
+
+
+ $vendor_id = phpgw::get_var('vendor_id', 'int');
+
+ if($vendor_id && !$application->vendor_id)
+ {
+ $vendor =
createObject('eventplanner.bovendor')->read_single($vendor_id);
+ $application->vendor_id = $vendor_id;
+ $application->vendor_name = $vendor->name;
+ $application->contact_name =
$vendor->contact_name;
+ $application->contact_email =
$vendor->contact_email;
+ $application->contact_phone =
$vendor->contact_phone;
+ }
+
$config = CreateObject('phpgwapi.config',
'eventplanner')->read();
$default_category =
!empty($config['default_application_category']) ?
$config['default_application_category'] : null;
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uivendor.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uivendor.inc.php
2017-03-07 14:04:59 UTC (rev 16406)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uivendor.inc.php
2017-03-07 14:06:34 UTC (rev 16407)
@@ -195,9 +195,16 @@
$tabs['first_tab'] = array(
'label' => lang('vendor'),
'link' => '#first_tab',
- 'function' => "set_tab('first_tab')"
+ // 'function' => "set_tab('first_tab')"
);
+ $tabs['application'] = array(
+ 'label' => lang('application'),
+ 'link' => '#application',
+ 'disable' => $id ? false : true,
+ // 'function' => "set_tab('application')"
+ );
+
$bocommon = CreateObject('property.bocommon');
$comments = (array)$vendor->comments;
@@ -225,6 +232,40 @@
)
);
+ $application_def = array(
+ array('key' => 'id', 'label' => lang('id'),
'sortable' => true, 'resizeable' => true,'formatter' =>
'JqueryPortico.formatLink'),
+ array('key' => 'title', 'label' =>
lang('title'), 'sortable' => false, 'resizeable' => true),
+ array('key' => 'date_start', 'label' =>
lang('date start'), 'sortable' => false, 'resizeable' => true),
+ array('key' => 'date_end', 'label' =>
lang('date end'), 'sortable' => false, 'resizeable' => true),
+ array('key' => 'number_of_units', 'label' =>
lang('number of units'), 'sortable' => true, 'resizeable' => true),
+ array('key' => 'timespan', 'label' =>
lang('event timespan'), 'sortable' => false, 'resizeable' => true),
+ );
+
+ $tabletools = array(
+ array(
+ 'my_name' => 'add',
+ 'text' => lang('add'),
+ 'type' => 'custom',
+ 'className' => 'add',
+ 'custom_code' => "
+
add_application({$id}, '{$this->currentapp}.uiapplication.edit' );"
+ )
+ );
+
+ $datatable_def[] = array(
+ 'container' => 'datatable-container_1',
+ 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uiapplication.query",
+ 'filter_vendor_id' => $id,
+ 'phpgw_return_as' => 'json'))),
+ 'tabletools' => $tabletools,
+ 'ColumnDefs' => $application_def,
+ 'data' => json_encode(array()),
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' => true)
+ )
+ );
+
$data = array(
'datatable_def' => $datatable_def,
'form_action' => self::link(array('menuaction'
=> "{$this->currentapp}.uivendor.save")),
@@ -237,6 +278,7 @@
);
phpgwapi_jquery::formvalidator_generate(array());
self::add_javascript('eventplannerfrontend', 'portico',
'validate.js');
+ self::add_javascript('eventplannerfrontend', 'portico',
'vendor.edit.js');
self::render_template_xsl(array('vendor',
'datatable_inline'), array($mode => $data));
}
Modified: branches/Version-2_0-branch/eventplanner/templates/base/vendor.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/vendor.xsl
2017-03-07 14:04:59 UTC (rev 16406)
+++ branches/Version-2_0-branch/eventplanner/templates/base/vendor.xsl
2017-03-07 14:06:34 UTC (rev 16407)
@@ -204,6 +204,9 @@
<xsl:value-of
select="php:function('lang', 'vendor description')"/>
</label>
<textarea cols="47"
rows="7" name="description">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:value-of
select="vendor/description"/>
</textarea>
</div>
@@ -212,9 +215,6 @@
<xsl:value-of
select="php:function('lang', 'remark')"/>
</label>
<textarea cols="47"
rows="7" name="remark">
- <xsl:attribute
name="data-validation">
-
<xsl:text>required</xsl:text>
- </xsl:attribute>
<xsl:value-of
select="vendor/remark"/>
</textarea>
</div>
@@ -246,8 +246,32 @@
</div>
</fieldset>
</div>
+ <div id="application">
+ <fieldset>
+
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'application')"/>
+ </label>
+ <div
class="pure-custom">
+ <xsl:for-each
select="datatable_def">
+ <xsl:if
test="container = 'datatable-container_1'">
+
<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="tabletools" select ='tabletools'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="config" select ='config'/>
+
</xsl:call-template>
+
</xsl:if>
+ </xsl:for-each>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</div>
- <div class="proplist-col">
+ <div id="submit_group_bottom" class="proplist-col">
<input type="submit" class="pure-button
pure-button-primary" name="save">
<xsl:attribute name="value">
<xsl:value-of
select="php:function('lang', 'save')"/>
Modified: branches/Version-2_0-branch/eventplannerfrontend/logout.php
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/logout.php 2017-03-07
14:04:59 UTC (rev 16406)
+++ branches/Version-2_0-branch/eventplannerfrontend/logout.php 2017-03-07
14:06:34 UTC (rev 16407)
@@ -68,4 +68,12 @@
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
}
+ $login = phpgw::get_var('login', 'bool');
+
+ if($login)
+ {
+
$GLOBALS['phpgw']->redirect_link('/eventplannerfrontend/login.php',
array('after' => phpgw::get_var('after', 'raw')));
+
+ }
+
$GLOBALS['phpgw']->redirect_link('/eventplannerfrontend/', array('cd'
=> 1, 'logout' => true));
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/vendor.xsl
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/templates/base/vendor.xsl
2017-03-07 14:04:59 UTC (rev 16406)
+++ branches/Version-2_0-branch/eventplannerfrontend/templates/base/vendor.xsl
2017-03-07 14:06:34 UTC (rev 16407)
@@ -194,6 +194,9 @@
<xsl:value-of
select="php:function('lang', 'vendor description')"/>
</label>
<textarea cols="47"
rows="7" name="description">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:value-of
select="vendor/description"/>
</textarea>
</div>
@@ -202,16 +205,37 @@
<xsl:value-of
select="php:function('lang', 'remark')"/>
</label>
<textarea cols="47"
rows="7" name="remark">
- <xsl:attribute
name="data-validation">
-
<xsl:text>required</xsl:text>
- </xsl:attribute>
<xsl:value-of
select="vendor/remark"/>
</textarea>
</div>
</fieldset>
</div>
+ <div id="application">
+ <fieldset>
+
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'application')"/>
+ </label>
+ <div
class="pure-custom">
+ <xsl:for-each
select="datatable_def">
+ <xsl:if
test="container = 'datatable-container_1'">
+
<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="tabletools" select ='tabletools'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="config" select ='config'/>
+
</xsl:call-template>
+
</xsl:if>
+ </xsl:for-each>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</div>
- <div class="proplist-col">
+ <div id="submit_group_bottom" class="proplist-col">
<input type="submit" class="pure-button
pure-button-primary" name="save">
<xsl:attribute name="value">
<xsl:value-of
select="php:function('lang', 'save')"/>
Modified: branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
2017-03-07 14:04:59 UTC (rev 16406)
+++ branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
2017-03-07 14:06:34 UTC (rev 16407)
@@ -205,7 +205,7 @@
{
$tpl_vars['login_text_org'] = '';
$tpl_vars['login_text'] = lang('Login');
- $tpl_vars['login_url'] = 'login.php?after='.
urlencode(json_encode($_GET));
+ $tpl_vars['login_url'] = 'logout.php?login=1&after='.
urlencode(json_encode($_GET));
$login_parameter = !empty($config_frontend['login_parameter'])
? $config_frontend['login_parameter'] : '';
$custom_login_url =
!empty($config_frontend['custom_login_url']) ?
$config_frontend['custom_login_url'] : '';
if($login_parameter)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16407] Stable: Merge 16405:16406 from trunk,
sigurdne <=