[Fusionforge-commits] FusionForge branch Branch_5_3 updated. cca13b6759adfafa2d7a1080f9ed749f3d25d9a1

Franck VILLAUME nerville at fusionforge.org
Thu Jan 30 10:56:56 CET 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  cca13b6759adfafa2d7a1080f9ed749f3d25d9a1 (commit)
      from  e65ac4b60beb6ea00f91cf454284af2f9b5d4da9 (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 cca13b6759adfafa2d7a1080f9ed749f3d25d9a1
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Jan 30 10:56:35 2014 +0100

    fix update skill: none is not a option due to database unique key

diff --git a/src/www/people/people_utils.php b/src/www/people/people_utils.php
index 50042df..aadcfe7 100644
--- a/src/www/people/people_utils.php
+++ b/src/www/people/people_utils.php
@@ -64,7 +64,7 @@ function people_skill_level_box($name='skill_level_id',$checked='xyxy') {
 		//will be used many times potentially on a single page
 		$PEOPLE_SKILL_LEVEL=db_query_params("SELECT * FROM people_skill_level", array());
 	}
-	return html_build_select_box ($PEOPLE_SKILL_LEVEL,$name,$checked);
+	return html_build_select_box($PEOPLE_SKILL_LEVEL,$name,$checked, false);
 }
 
 function people_skill_year_box($name='skill_year_id',$checked='xyxy') {
@@ -73,7 +73,7 @@ function people_skill_year_box($name='skill_year_id',$checked='xyxy') {
 		//will be used many times potentially on a single page
 		$PEOPLE_SKILL_YEAR=db_query_params("SELECT * FROM people_skill_year", array());
 	}
-	return html_build_select_box ($PEOPLE_SKILL_YEAR,$name,$checked);
+	return html_build_select_box ($PEOPLE_SKILL_YEAR,$name,$checked, false);
 }
 
 function people_job_status_box($name='status_id',$checked='xyxy') {
@@ -229,11 +229,11 @@ VALUES ($1, $2, $3, $4)', array($job_id, $skill_id, $skill_level_id, $skill_year
 
 function people_show_job_inventory($job_id) {
 	$result=db_query_params('SELECT people_skill.name AS skill_name, people_skill_level.name AS level_name, people_skill_year.name AS year_name
-FROM people_skill_year,people_skill_level,people_skill,people_job_inventory
-WHERE people_skill_year.skill_year_id=people_job_inventory.skill_year_id
-AND people_skill_level.skill_level_id=people_job_inventory.skill_level_id
-AND people_skill.skill_id=people_job_inventory.skill_id
-AND people_job_inventory.job_id=$1', array($job_id));
+				FROM people_skill_year,people_skill_level,people_skill,people_job_inventory
+				WHERE people_skill_year.skill_year_id=people_job_inventory.skill_year_id
+				AND people_skill_level.skill_level_id=people_job_inventory.skill_level_id
+				AND people_skill.skill_id=people_job_inventory.skill_id
+				AND people_job_inventory.job_id=$1', array($job_id));
 
 	$title_arr=array();
 	$title_arr[]=_('Skill');
@@ -298,7 +298,7 @@ function people_edit_job_inventory($job_id,$group_id) {
 	$result=db_query_params('SELECT * FROM people_job_inventory WHERE job_id=$1', array($job_id));
 
 	$title_arr=array();
-	$title_arr[]=_('Skill').utils_requiredField();
+	$title_arr[]=_('Skill');
 	$title_arr[]=_('Level').utils_requiredField();
 	$title_arr[]=_('Experience').utils_requiredField();
 	$title_arr[]=_('Action');

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

Summary of changes:
 src/www/people/people_utils.php |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list