Changeset 613

Show
Ignore:
Timestamp:
10/16/07 23:14:20 (1 year ago)
Author:
laurentj
Message:

fixed bug #300: jforms, errors set with setErrorOn were not displayed. p=bbalizlife
fixed also a little bug in jAcl : it didn't get the user data from the right session variable when the user is stored in other variable than JELIX_USER

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.0beta3.x/lib/jelix/acl/jAclDbUserGroup.class.php

    r563 r613  
    4949        if($groups === null){ 
    5050            $dao = jDao::get('jelix~jaclusergroup', jAclDb::getProfil()); 
    51             $gp = $dao->getGroupsUser($_SESSION['JELIX_USER']->login); 
     51            $gp = $dao->getGroupsUser(jAuth::getUserSession()->login); 
    5252            $groups = array(); 
    5353            foreach($gp as $g){ 

  • branches/1.0beta3.x/lib/jelix/acl/jAclDbUserGroup.class.php

    r563 r613  
    4949        if($groups === null){ 
    5050            $dao = jDao::get('jelix~jaclusergroup', jAclDb::getProfil()); 
    51             $gp = $dao->getGroupsUser($_SESSION['JELIX_USER']->login); 
     51            $gp = $dao->getGroupsUser(jAuth::getUserSession()->login); 
    5252            $groups = array(); 
    5353            foreach($gp as $g){ 

  • branches/1.0beta3.x/lib/jelix/forms/jFormsBuilderBase.class.php

    r610 r613  
    138138                        echo '<li>', jLocale::get('jelix~formserr.js.err.required', $ctrls[$cname]->label),'</li>'; 
    139139                    } 
     140                }elseif ($err != '' && $err != JFORM_ERRDATA_INVALID) { 
     141                    echo '<li>', $err,'</li>'; 
    140142                }else{ 
    141143                    if($ctrls[$cname]->alertInvalid){ 

  • branches/1.0beta3.x/lib/jelix/forms/jFormsBuilderBase.class.php

    r610 r613  
    138138                        echo '<li>', jLocale::get('jelix~formserr.js.err.required', $ctrls[$cname]->label),'</li>'; 
    139139                    } 
     140                }elseif ($err != '' && $err != JFORM_ERRDATA_INVALID) { 
     141                    echo '<li>', $err,'</li>'; 
    140142                }else{ 
    141143                    if($ctrls[$cname]->alertInvalid){ 

  • trunk/lib/jelix/acl/jAclDbUserGroup.class.php

    r563 r613  
    4949        if($groups === null){ 
    5050            $dao = jDao::get('jelix~jaclusergroup', jAclDb::getProfil()); 
    51             $gp = $dao->getGroupsUser($_SESSION['JELIX_USER']->login); 
     51            $gp = $dao->getGroupsUser(jAuth::getUserSession()->login); 
    5252            $groups = array(); 
    5353            foreach($gp as $g){ 

  • trunk/lib/jelix/acl/jAclDbUserGroup.class.php

    r563 r613  
    4949        if($groups === null){ 
    5050            $dao = jDao::get('jelix~jaclusergroup', jAclDb::getProfil()); 
    51             $gp = $dao->getGroupsUser($_SESSION['JELIX_USER']->login); 
     51            $gp = $dao->getGroupsUser(jAuth::getUserSession()->login); 
    5252            $groups = array(); 
    5353            foreach($gp as $g){ 

  • trunk/lib/jelix/forms/jFormsBuilderBase.class.php

    r610 r613  
    139139                        echo '<li>', jLocale::get('jelix~formserr.js.err.required', $ctrls[$cname]->label),'</li>'; 
    140140                    } 
     141                }elseif ($err != '' && $err != JFORM_ERRDATA_INVALID) { 
     142                    echo '<li>', $err,'</li>'; 
    141143                }else{ 
    142144                    if($ctrls[$cname]->alertInvalid){ 

  • trunk/lib/jelix/forms/jFormsBuilderBase.class.php

    r610 r613  
    139139                        echo '<li>', jLocale::get('jelix~formserr.js.err.required', $ctrls[$cname]->label),'</li>'; 
    140140                    } 
     141                }elseif ($err != '' && $err != JFORM_ERRDATA_INVALID) { 
     142                    echo '<li>', $err,'</li>'; 
    141143                }else{ 
    142144                    if($ctrls[$cname]->alertInvalid){ 
Download in other formats: Unified Diff Zip Archive