Merge lp:~gt/sahana-agasti/relief-experiments into lp:~sahana-relief-team/sahana-agasti/trunk

[Gavin Treadgold]

[Gavin Treadgold (gt)]

Proposing merge from personal branch of fix for lp:481517

[Ajay Kumar (ajuonline)]

review: Approve

=== modified file 'inc/lib_form.inc'
--- inc/lib_form.inc	2009-11-10 23:51:44 +0000
+++ inc/lib_form.inc	2009-11-17 18:05:21 +0000
@@ -457,7 +457,8 @@
 	tabindex="<?php echo ++$shn_tabindex?>">
 	<?php
 	if($extra_opts["sort"]==true){
-		$q="select * from field_options where field_name='$opt_field' order by option_code";
+		$sort=$extra_opts['sort'];		
+		$q="select * from field_options where field_name='" . $opt_field . "' order by " . $sort;
 	} else{
 		$q="select * from field_options where field_name='$opt_field'";
 	}

=== modified file 'mod/or/lib_or.inc'
--- mod/or/lib_or.inc	2009-11-15 01:08:03 +0000
+++ mod/or/lib_or.inc	2009-11-17 18:05:21 +0000
@@ -671,7 +671,7 @@
     ?><div class="info"><?php echo _t("Select the services that your organization provides, that is what you do as an organization, or the services your organization can provide in a disaster situation. e.g. If you offer medical services select it.");?></div><br />
     <?php }
     $extra_opts['req']=true;
-    $extra_opts['sort']=true;
+    $extra_opts['sort']="option_description ASC";
   //  $extra_opts['help']=_t("select the services your provide ,i.e what you do as an organization. e.g.if you are a supplier select it");
     shn_form_opt_multi_select('opt_sector_type','','multiple="true"',$extra_opts);
 }