Allows search on both only_referent and compagny fields (Closes #1513).

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/ChangeLog b/ChangeLog
index 6df06de..585948c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ Bug/Wish:
 
     * Search:
         - #1285: Autocompletes on internal words in university search      -JAC
+        - #1513: Allows search on both only_referent and compagny fields   -JAC
 
     * XnetGrp:
         - #947: Lists group former members to group admins                 -JAC

diff --git a/htdocs/javascript/search.js b/htdocs/javascript/search.js
index 2c3c1c3..dc11a4c 100644 (file)
--- a/htdocs/javascript/search.js
+++ b/htdocs/javascript/search.js
@@ -323,16 +323,6 @@ function changeSchool(schoolId, diploma)
     });
 }
 
-// when checking/unchecking "only_referent", disable/enable some fields
-function changeOnlyReferent()
-{
-    if ($("#only_referent").is(':checked')) {
-        $("input[name='entreprise']").attr('disabled', true);
-    } else {
-        $("input[name='entreprise']").removeAttr('disabled');
-    }
-}
-
 // when choosing a job term in tree, hide tree and set job term field
 function searchForJobTerm(treeid, jtid, full_name)
 {

diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php
index 5d52807..bb0a33a 100644 (file)
--- a/include/ufbuilder.inc.php
+++ b/include/ufbuilder.inc.php
@@ -1132,35 +1132,10 @@ class UFBF_AddressIndex extends UFBF_Index
 // {{{ class UFBF_JobCompany
 class UFBF_JobCompany extends UFBF_Text
 {
-    private $onlymentorfield;
-
-    public function __construct($envfield, $formtext = '', $onlymentorfield = 'only_referent')
-    {
-        parent::__construct($envfield, $formtext);
-        $this->onlymentorfield = $onlymentorfield;
-    }
-
-    public function check(UserFilterBuilder $ufb) {
-        if (parent::check($ufb)) {
-            # No company check for mentors
-           if ($ufb->isOn($this->onlymentorfield)) {
-                $this->empty = true;
-           }
-           return true;
-        } else {
-            return false;
-        }
-    }
-
     protected function buildUFC(UserFilterBuilder $ufb)
     {
         return new UFC_Job_Company(UFC_Job_Company::JOBNAME, $this->val);
     }
-
-    public function getEnvFieldNames()
-    {
-        return array($this->envfield, $this->onlymentorfield);
-    }
 }
 // }}}