[Fusionforge-commits] FusionForge branch Branch_5_3 updated. d63672879fdd068809fedc25e603293ead3adb50

Franck Villaume nerville at fusionforge.org
Sat Jun 21 09:24:09 CEST 2014


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, Branch_5_3 has been updated
       via  d63672879fdd068809fedc25e603293ead3adb50 (commit)
       via  4bfa852daee1f6d3fd39b8142d311b0f33a3da4e (commit)
      from  df10014490ca945c1248303c35ceb8754dbb4ce6 (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 -----------------------------------------------------------------
commit d63672879fdd068809fedc25e603293ead3adb50
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jun 21 09:21:44 2014 +0200

    sync CHANGES

diff --git a/src/CHANGES b/src/CHANGES
index c230d3f..554b44e 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -3,6 +3,7 @@ Fusionforge-5.3.2:
 * SCM Git: suppress 'warning: You appear to have cloned an empty repository.' in create_scm_repos.php (Inria)
 * SCM Git: handle bad encoding when gathering stats (Inria)
 * Plugin mediawiki: fix paths in import/export scripts (Inria)
+* Admin: fix edit table themes, fix frs_processor sequence [#691] (TrivialDev)
 
 Fusionforge-5.3.1:
 * Docman: Basic Webdav write mkcol support (TrivialDev)

commit 4bfa852daee1f6d3fd39b8142d311b0f33a3da4e
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jun 21 09:20:10 2014 +0200

    fix [#691]: adding a new theme cause an error

diff --git a/src/db/20140621-set-frs_processor_seq.sql b/src/db/20140621-set-frs_processor_seq.sql
new file mode 100644
index 0000000..8b71fab
--- /dev/null
+++ b/src/db/20140621-set-frs_processor_seq.sql
@@ -0,0 +1 @@
+SELECT setval('frs_processor_pk_seq', (SELECT MAX(processor_id) FROM frs_processor));
diff --git a/src/www/admin/admin_table.php b/src/www/admin/admin_table.php
index c3729ff..5cde902 100644
--- a/src/www/admin/admin_table.php
+++ b/src/www/admin/admin_table.php
@@ -4,7 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) Franck Villaume - Capgemini
- * Copyright 2012, Franck Villaume - TrivialDev
+ * Copyright 2012,2014 Franck Villaume - TrivialDev
  *
  * This file is part of FusionForge. FusionForge is free software;
  * you can redistribute it and/or modify it under the terms of the
@@ -47,10 +47,11 @@ function admin_table_add($table, $unit, $primary_key) {
 
 		for ($i = 0; $i < $cols; $i++) {
 			$fieldname = db_fieldname($result, $i);
-			$fields[] = $fieldname;
-
-			echo '<tr><td><strong>'.$fieldname.'</strong></td>';
-			echo '<td><input type="text" name="'.$fieldname.'" value="" /></td></tr>';
+			if ($fieldname != $primary_key) {
+				$fields[] = $fieldname;
+				echo '<tr><td><strong>'.$fieldname.'</strong></td>';
+				echo '<td><input type="text" name="'.$fieldname.'" value="" required="required" /></td></tr>';
+			}
 		}
 		echo '</table><input type="submit" value="'._('Add').'" />
 			<input type="hidden" name="__fields__" value="'.implode(',',$fields).'" />

-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES                               |    1 +
 src/db/20140621-set-frs_processor_seq.sql |    1 +
 src/www/admin/admin_table.php             |   11 ++++++-----
 3 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 src/db/20140621-set-frs_processor_seq.sql


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list