This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via e5daafc5f94dd177030ac691c676c086d4e51759 (commit)
via 04a585b646bd2027a195bf8c0a7b762f123a2105 (commit)
via 8f29af0a4e9f4e1c03ddf5fe9506774494fbe8f0 (commit)
from b1a90d0cdc78cce2f6c33aa93a140fc6d3281178 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e5daafc5f94dd177030ac691c676c086d4e51759
commit e5daafc5f94dd177030ac691c676c086d4e51759
Author: Franck Villaume <[email protected]>
Date: Thu Dec 15 17:45:33 2016 +0100
real fix for updatelayout
diff --git a/src/www/widgets/updatelayout.php b/src/www/widgets/updatelayout.php
index d756d23..d23260c 100644
--- a/src/www/widgets/updatelayout.php
+++ b/src/www/widgets/updatelayout.php
@@ -86,7 +86,8 @@ if ($owner) {
$param = $request->get('name');
$name = array_pop(array_keys($param));
}
- $instance_id = (int)$param[$name][$action];
+ $instance_id = (int)$param[$name];
+
switch($request->get('action')) {
case 'widget':
if ($name &&
$request->exist('layout_id')) {
@@ -95,6 +96,7 @@ if ($owner) {
$action =
array_pop(array_keys($param[$name]));
switch($action)
{
case
'remove':
+
$instance_id = (int)$param[$name][$action];
if (($owner_type == WidgetLayoutManager::OWNER_TYPE_GROUP) && (forge_check_perm
('project_admin', $owner_id, NULL))) {
$lm->removeWidget($owner_id, $owner_type, $layout_id, $name,
$instance_id, $widget);
} elseif (($owner_type == WidgetLayoutManager::OWNER_TYPE_HOME) &&
(forge_check_global_perm('forge_admin'))) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=04a585b646bd2027a195bf8c0a7b762f123a2105
commit 04a585b646bd2027a195bf8c0a7b762f123a2105
Author: Franck Villaume <[email protected]>
Date: Thu Dec 15 16:53:27 2016 +0100
fix display preference in widget
diff --git a/src/www/widgets/updatelayout.php b/src/www/widgets/updatelayout.php
index 51d2b72..d756d23 100644
--- a/src/www/widgets/updatelayout.php
+++ b/src/www/widgets/updatelayout.php
@@ -86,6 +86,7 @@ if ($owner) {
$param = $request->get('name');
$name = array_pop(array_keys($param));
}
+ $instance_id = (int)$param[$name][$action];
switch($request->get('action')) {
case 'widget':
if ($name &&
$request->exist('layout_id')) {
@@ -94,7 +95,6 @@ if ($owner) {
$action =
array_pop(array_keys($param[$name]));
switch($action)
{
case
'remove':
-
$instance_id = (int)$param[$name][$action];
if (($owner_type == WidgetLayoutManager::OWNER_TYPE_GROUP) && (forge_check_perm
('project_admin', $owner_id, NULL))) {
$lm->removeWidget($owner_id, $owner_type, $layout_id, $name,
$instance_id, $widget);
} elseif (($owner_type == WidgetLayoutManager::OWNER_TYPE_HOME) &&
(forge_check_global_perm('forge_admin'))) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8f29af0a4e9f4e1c03ddf5fe9506774494fbe8f0
commit 8f29af0a4e9f4e1c03ddf5fe9506774494fbe8f0
Author: Franck Villaume <[email protected]>
Date: Thu Dec 15 16:50:29 2016 +0100
remove empty line
diff --git a/src/www/include/jquery_plugins.php
b/src/www/include/jquery_plugins.php
index 0f60c6c..c8f9787 100644
--- a/src/www/include/jquery_plugins.php
+++ b/src/www/include/jquery_plugins.php
@@ -22,7 +22,6 @@
*/
function init_datetimepicker() {
-
// awful hack
$language_code =
language_name_to_locale_code(choose_language_from_context ());
if (!in_array($language_code,array('en-GB','pt-BR','sr-YU','zh-TW'))) {
-----------------------------------------------------------------------
Summary of changes:
src/www/include/jquery_plugins.php | 1 -
src/www/widgets/updatelayout.php | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
