[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16416] Stable: Merge 16409:16415 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16416] Stable: Merge 16409:16415 from trunk |
Date: |
Thu, 9 Mar 2017 05:33:46 -0500 (EST) |
Revision: 16416
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16416
Author: sigurdne
Date: 2017-03-09 05:33:46 -0500 (Thu, 09 Mar 2017)
Log Message:
-----------
Stable: Merge 16409:16415 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer_report.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uivendor.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.uicommon.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
Added Paths:
-----------
branches/Version-2_0-branch/eventplanner/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-09 10:32:04 UTC (rev 16415)
+++ branches/Version-2_0-branch 2017-03-09 10:33:46 UTC (rev 16416)
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,16408
\ 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
\ 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-09 10:32:04 UTC (rev 16415)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-03-09 10:33:46 UTC (rev 16416)
@@ -197,7 +197,7 @@
'parameters' => json_encode($parameters)
);
- self::add_javascript('eventplannerfrontend', 'portico',
'application.index.js');
+ self::add_javascript($this->currentapp, 'portico',
'application.index.js');
phpgwapi_jquery::load_widget('numberformat');
self::render_template_xsl('datatable_jquery', $data);
@@ -420,7 +420,7 @@
);
phpgwapi_jquery::formvalidator_generate(array('date',
'security', 'file'));
phpgwapi_jquery::load_widget('autocomplete');
- self::add_javascript('eventplannerfrontend', 'portico',
'application.edit.js');
+ self::add_javascript($this->currentapp, 'portico',
'application.edit.js');
self::render_template_xsl(array('application',
'datatable_inline'), array($mode => $data));
}
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
2017-03-09 10:32:04 UTC (rev 16415)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
2017-03-09 10:33:46 UTC (rev 16416)
@@ -147,7 +147,7 @@
'parameters' => json_encode($parameters)
);
- self::add_javascript('eventplanner', 'portico',
'booking.index.js');
+ self::add_javascript($this->currentapp, 'portico',
'booking.index.js');
phpgwapi_jquery::load_widget('numberformat');
self::render_template_xsl('datatable_jquery', $data);
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
2017-03-09 10:32:04 UTC (rev 16415)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
2017-03-09 10:33:46 UTC (rev 16416)
@@ -161,7 +161,7 @@
'parameters' => json_encode($parameters)
);
- self::add_javascript('eventplanner', 'portico',
'customer.index.js');
+ self::add_javascript($this->currentapp, 'portico',
'customer.index.js');
phpgwapi_jquery::load_widget('numberformat');
self::render_template_xsl('datatable_jquery', $data);
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer_report.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer_report.inc.php
2017-03-09 10:32:04 UTC (rev 16415)
+++
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer_report.inc.php
2017-03-09 10:33:46 UTC (rev 16416)
@@ -153,7 +153,7 @@
'parameters' => json_encode($parameters)
);
- self::add_javascript('eventplanner', 'portico',
'customer_report.index.js');
+ self::add_javascript($this->currentapp, 'portico',
'customer_report.index.js');
phpgwapi_jquery::load_widget('numberformat');
self::render_template_xsl('datatable_jquery', $data);
@@ -250,7 +250,7 @@
);
phpgwapi_jquery::formvalidator_generate(array('date',
'security', 'file'));
phpgwapi_jquery::load_widget('autocomplete');
- // self::add_javascript('eventplanner', 'portico',
'customer_report.edit.js');
+ // self::add_javascript($this->currentapp, 'portico',
'customer_report.edit.js');
self::render_template_xsl(array('report','application_info',
'datatable_inline', 'attributes_form'), array($mode => $data));
}
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
2017-03-09 10:32:04 UTC (rev 16415)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
2017-03-09 10:33:46 UTC (rev 16416)
@@ -173,7 +173,7 @@
'parameters' => json_encode($parameters)
);
- self::add_javascript('eventplanner', 'portico',
'events.index.js');
+ self::add_javascript($this->currentapp, 'portico',
'events.index.js');
phpgwapi_jquery::load_widget('numberformat');
self::render_template_xsl('datatable_jquery', $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-09 10:32:04 UTC (rev 16415)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uivendor.inc.php
2017-03-09 10:33:46 UTC (rev 16416)
@@ -162,7 +162,7 @@
'parameters' => json_encode($parameters)
);
- self::add_javascript('eventplanner', 'portico',
'vendor.index.js');
+ self::add_javascript('eventplannerfrontend', 'portico',
'vendor.index.js');
phpgwapi_jquery::load_widget('numberformat');
self::render_template_xsl('datatable_jquery', $data);
@@ -278,7 +278,7 @@
);
phpgwapi_jquery::formvalidator_generate(array());
self::add_javascript('eventplannerfrontend', 'portico',
'validate.js');
- self::add_javascript('eventplannerfrontend', 'portico',
'vendor.edit.js');
+ self::add_javascript($this->currentapp, 'portico',
'vendor.edit.js');
self::render_template_xsl(array('vendor',
'datatable_inline'), array($mode => $data));
}
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
2017-03-09 10:32:04 UTC (rev 16415)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uivendor_report.inc.php
2017-03-09 10:33:46 UTC (rev 16416)
@@ -153,7 +153,7 @@
'parameters' => json_encode($parameters)
);
- self::add_javascript('eventplanner', 'portico',
'vendor_report.index.js');
+ self::add_javascript($this->currentapp, 'portico',
'vendor_report.index.js');
phpgwapi_jquery::load_widget('numberformat');
self::render_template_xsl('datatable_jquery', $data);
@@ -250,7 +250,7 @@
);
phpgwapi_jquery::formvalidator_generate(array('date',
'security', 'file'));
phpgwapi_jquery::load_widget('autocomplete');
- // self::add_javascript('eventplanner', 'portico',
'vendor_report.edit.js');
+ // self::add_javascript($this->currentapp, 'portico',
'vendor_report.edit.js');
self::render_template_xsl(array('report','application_info',
'datatable_inline', 'attributes_form'), array($mode => $data));
}
Copied: branches/Version-2_0-branch/eventplanner/js/portico/vendor.edit.js
(from rev 16415, trunk/eventplanner/js/portico/vendor.edit.js)
===================================================================
--- branches/Version-2_0-branch/eventplanner/js/portico/vendor.edit.js
(rev 0)
+++ branches/Version-2_0-branch/eventplanner/js/portico/vendor.edit.js
2017-03-09 10:33:46 UTC (rev 16416)
@@ -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/phpgwapi/inc/class.uicommon.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.uicommon.inc.php
2017-03-09 10:32:04 UTC (rev 16415)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.uicommon.inc.php
2017-03-09 10:33:46 UTC (rev 16416)
@@ -49,12 +49,14 @@
$composite_types,
$payment_methods,
$permissions,
- $called_class_arr;
+ $called_class_arr,
+ $currentapp;
public function __construct()
{
parent::__construct();
$called_class = get_called_class();
+ $this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->called_class_arr = explode('_', $called_class,
2);
}
@@ -122,8 +124,6 @@
public function save($ajax = false)
{
- $called_class = get_called_class();
-
if (empty($this->permissions[PHPGW_ACL_ADD]))
{
phpgw::no_access();
@@ -160,7 +160,7 @@
{
phpgwapi_cache::message_set(lang('messages_saved_form'), 'message');
self::redirect(array(
- 'menuaction' =>
"{$this->called_class_arr[0]}.{$this->called_class_arr[1]}.edit",
+ 'menuaction' =>
"{$this->currentapp}.{$this->called_class_arr[1]}.edit",
'id' =>
$object->get_id(),
'active_tab' =>
$active_tab
)
@@ -230,7 +230,7 @@
public function query($relaxe_acl = false)
{
$values = $this->get_data($relaxe_acl);
- array_walk($values["results"], array($this,
"_add_links"),
"{$this->called_class_arr[0]}.{$this->called_class_arr[1]}.edit");
+ array_walk($values["results"], array($this,
"_add_links"), "{$this->currentapp}.{$this->called_class_arr[1]}.edit");
return $this->jquery_results($values);
}
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
2017-03-09 10:32:04 UTC (rev 16415)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
2017-03-09 10:33:46 UTC (rev 16416)
@@ -182,8 +182,10 @@
$this->add_js_event('load', $js);
}
- public function link( $data )
+ function get_link_base()
{
+ $base = '/index.php';
+
switch ($GLOBALS['phpgw_info']['flags']['currentapp'])
{
case 'bookingfrontend':
@@ -199,28 +201,19 @@
$base = '/index.php';
break;
}
+ return $base;
+ }
+ public function link( $data )
+ {
+ $base = self::get_link_base();
return $GLOBALS['phpgw']->link($base, $data);
-
-/*
- if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'bookingfrontend')
- {
- return
$GLOBALS['phpgw']->link('/bookingfrontend/', $data);
- }
- else if ($GLOBALS['phpgw_info']['flags']['currentapp']
== 'activitycalendarfrontend')
- {
- return
$GLOBALS['phpgw']->link('/activitycalendarfrontend/', $data);
- }
- else
- {
- return $GLOBALS['phpgw']->link('/index.php',
$data);
- }
- */
}
public function redirect( $link_data )
{
- $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
+ $base = self::get_link_base();
+ $GLOBALS['phpgw']->redirect_link($base, $link_data);
}
public function flash( $msg, $type = 'success' )
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16416] Stable: Merge 16409:16415 from trunk,
sigurdne <=