[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16409] Stable: Merge 16407:16408 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16409] Stable: Merge 16407:16408 from trunk |
|
Date: |
Tue, 7 Mar 2017 09:47:54 -0500 (EST) |
Revision: 16409
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16409
Author: sigurdne
Date: 2017-03-07 09:47:53 -0500 (Tue, 07 Mar 2017)
Log Message:
-----------
Stable: Merge 16407:16408 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/eventplannerfrontend/js/portico/application.edit.js
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
Added Paths:
-----------
branches/Version-2_0-branch/eventplannerfrontend/js/portico/vendor.edit.js
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-03-07 14:46:59 UTC (rev 16408)
+++ branches/Version-2_0-branch 2017-03-07 14:47:53 UTC (rev 16409)
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,16406
\ 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
\ 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:46:59 UTC (rev 16408)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-03-07 14:47:53 UTC (rev 16409)
@@ -420,7 +420,7 @@
);
phpgwapi_jquery::formvalidator_generate(array('date',
'security', 'file'));
phpgwapi_jquery::load_widget('autocomplete');
- self::add_javascript('eventplanner', 'portico',
'application.edit.js');
+ self::add_javascript('eventplannerfrontend', 'portico',
'application.edit.js');
self::render_template_xsl(array('application',
'datatable_inline'), array($mode => $data));
}
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:46:59 UTC (rev 16408)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uivendor.inc.php
2017-03-07 14:47:53 UTC (rev 16409)
@@ -248,7 +248,7 @@
'type' => 'custom',
'className' => 'add',
'custom_code' => "
-
add_application({$id}, '{$this->currentapp}.uiapplication.edit' );"
+
add_application('{$this->currentapp}',
'{$this->currentapp}.uiapplication.edit', {$id});"
)
);
Modified:
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
2017-03-07 14:46:59 UTC (rev 16408)
+++
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
2017-03-07 14:47:53 UTC (rev 16409)
@@ -1,8 +1,8 @@
var vendor_id_selection;
var lang;
-var oArgs = {menuaction: 'eventplanner.uivendor.index', organization_number:
true};
-var strURL = phpGWLink('index.php', oArgs, true);
+var oArgs = {menuaction: 'eventplannerfrontend.uivendor.index',
organization_number: true};
+var strURL = phpGWLink('eventplannerfrontend/', oArgs, true);
JqueryPortico.autocompleteHelper(strURL, 'vendor_name', 'vendor_id',
'vendor_container', 'name');
$(window).on('load', function ()
@@ -31,11 +31,11 @@
return;
}
oArgs = {
- menuaction: 'eventplanner.uivendor.get',
+ menuaction: 'eventplannerfrontend.uivendor.get',
id: vendor_id
};
- var requestUrl = phpGWLink('index.php', oArgs, true);
+ var requestUrl = phpGWLink('eventplannerfrontend/', oArgs, true);
var data = {};
JqueryPortico.execute_ajax(requestUrl,
@@ -269,11 +269,11 @@
}
oArgs = {
- menuaction: 'eventplanner.uibooking.save_ajax',
+ menuaction: 'eventplannerfrontend.uibooking.save_ajax',
application_id: $("#application_id").val()
};
- var requestUrl = phpGWLink('index.php', oArgs, true);
+ var requestUrl = phpGWLink('eventplannerfrontend/', oArgs, true);
var htmlString = '';
$("#receipt").html("");
var data = {from_: from_, active: 1};
@@ -319,9 +319,9 @@
{
return;
}
- oArgs = {menuaction: 'eventplanner.uibooking.update_schedule'};
+ oArgs = {menuaction: 'eventplannerfrontend.uibooking.update_schedule'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
+ var requestUrl = phpGWLink('eventplannerfrontend/', oArgs, true);
var htmlString = '';
$("#receipt").html("");
@@ -391,9 +391,9 @@
{
var data = {"ids": ids, "action": action, from_:
$("#from_").val()};
- oArgs = {menuaction:
'eventplanner.uibooking.update_active_status'};
+ oArgs = {menuaction:
'eventplannerfrontend.uibooking.update_active_status'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
+ var requestUrl = phpGWLink('eventplannerfrontend/', oArgs,
true);
var htmlString = '';
$("#receipt").html("");
Copied:
branches/Version-2_0-branch/eventplannerfrontend/js/portico/vendor.edit.js
(from rev 16408, trunk/eventplannerfrontend/js/portico/vendor.edit.js)
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/js/portico/vendor.edit.js
(rev 0)
+++ branches/Version-2_0-branch/eventplannerfrontend/js/portico/vendor.edit.js
2017-03-07 14:47:53 UTC (rev 16409)
@@ -0,0 +1,37 @@
+function set_tab(tab)
+{
+ $("#active_tab").val(tab);
+ if (tab === 'application')
+ {
+ $("#submit_group_bottom").hide();
+ }
+ else
+ {
+ $("#submit_group_bottom").show();
+ }
+}
+
+add_application = function (app, menuaction, vendor_id)
+{
+ if (!vendor_id)
+ {
+ return;
+ }
+
+ oArgs = {
+ menuaction: menuaction,
+ vendor_id: vendor_id
+ };
+
+ var requestUrl;
+ if (app === 'eventplannerfrontend')
+ {
+ requestUrl = phpGWLink('eventplannerfrontend/', oArgs);
+ }
+ else
+ {
+ requestUrl = phpGWLink('index.php', oArgs);
+ }
+ alert(requestUrl);
+ window.location = requestUrl;
+};
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-03-07 14:46:59 UTC (rev 16408)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-03-07 14:47:53 UTC (rev 16409)
@@ -137,12 +137,13 @@
<xsl:text>required</xsl:text>
</xsl:attribute>
</input>
+ <!--
<xsl:text>
</xsl:text>
<a
href="{new_vendor_url}" target="_blank">
<xsl:value-of select="php:function('lang', 'new')"/>
<xsl:text> </xsl:text>
<xsl:value-of select="php:function('lang', 'vendor')"/>
- </a>
+ </a>-->
<div
id="vendor_container"/>
</div>
<div
class="pure-control-group">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16409] Stable: Merge 16407:16408 from trunk,
sigurdne <=