cvs commit: jahia/src/java/org/jahia/data/fields JahiaPageField.java

[Serge Huber]

shuber      2004/09/09 12:18:01 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/data/fields JahiaPageField.java 
  Log:
  Bugfix on page links : we no longer display them in core engine (regular navigation) 
when the linked page is :
  - unauthorized
  - exists only in staging and we are navigating in active mode.
  
  Revision  Changes    Path
  1.41.2.1  +7 -6      jahia/src/java/org/jahia/data/fields/JahiaPageField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/fields/JahiaPageField.java.diff?r1=1.41&r2=1.41.2.1&f=h
  
  
  
  Index: JahiaPageField.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/data/fields/Attic/JahiaPageField.java,v
  retrieving revision 1.41
  retrieving revision 1.41.2.1
  diff -u -r1.41 -r1.41.2.1
  --- JahiaPageField.java       14 Jan 2004 14:32:51 -0000      1.41
  +++ JahiaPageField.java       9 Sep 2004 10:18:00 -0000       1.41.2.1
  @@ -202,11 +202,12 @@
                                       }
                                   }
                               } else {
  -                                //this.setObject (null);
  -                                //if 
(this.getValue().toUpperCase().indexOf("JAHIA_LINKONLY") == -1)
  -                                //{
  -                                //    this.setValue ("");
  -                                //}
  +                                if ((jParams != null) && 
(jParams.getEngine().equals(ParamBean.CORE_ENGINE_NAME))) {
  +                                    this.setObject (null);
  +                                    if 
(this.getValue().toUpperCase().indexOf("JAHIA_LINKONLY") == -1) {
  +                                        this.setValue ("");
  +                                    }
  +                                }
                               }
   
                               break;
  @@ -472,4 +473,4 @@
           return values;
       }
   
  -}
  \ No newline at end of file
  +}