commit 52b336928eb76f12dae3c69e2251ae74a35f4992
parent 7e1083044283264dbc62a82ee9dbb0832d8dc5c6
Author: dankert <devnull@localhost>
Date: Thu, 21 Apr 2005 21:08:44 +0200
Vorbelegung fuer "list"-Element
Diffstat:
2 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/actionClasses/ElementAction.class.php b/actionClasses/ElementAction.class.php
@@ -20,7 +20,10 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// ---------------------------------------------------------------------------
// $Log$
-// Revision 1.10 2005-01-03 19:37:15 dankert
+// Revision 1.11 2005-04-21 19:08:44 dankert
+// Vorbelegung fuer "list"-Element
+//
+// Revision 1.10 2005/01/03 19:37:15 dankert
// Bei dynamic-Elementen einfaches Array erzeugen
//
// Revision 1.9 2004/12/30 23:31:27 dankert
@@ -362,21 +365,38 @@ class ElementAction extends Action
$objects = array();
- // Ermitteln aller verf?gbaren Objekt-IDs
+ // Ermitteln aller verfuegbaren Objekt-IDs
foreach( Folder::getAllObjectIds() as $id )
{
$o = new Object( $id );
$o->load();
- if ( $o->getType() != 'folder' )
- {
+ switch( $this->element->type )
+ {
+ case 'list':
+ if ( !$o->isFolder )
+ continue 2;
+ break;
+
+ case 'link':
+ if ( !$o->isPage && !$o->isFile )
+ continue 2;
+ break;
+
+ default:
+ continue 2;
+ }
+
+ $objects[ $id ] = lang( 'GLOBAL_'.$o->getType() ).': ';
+
+ if ( !$o->isRoot )
+ {
$f = new Folder( $o->parentid );
$f->load();
-
- $objects[ $id ] = lang( 'GLOBAL_'.$o->getType() ).': ';
$objects[ $id ] .= implode( FILE_SEP,$f->parentObjectNames(false,true) );
- $objects[ $id ] .= FILE_SEP.$o->name;
- }
+ }
+
+ $objects[ $id ] .= FILE_SEP.$o->name;
}
asort( $objects ); // Sortieren
diff --git a/objectClasses/Element.class.php b/objectClasses/Element.class.php
@@ -20,7 +20,10 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// ---------------------------------------------------------------------------
// $Log$
-// Revision 1.10 2005-01-04 19:58:22 dankert
+// Revision 1.11 2005-04-21 19:08:44 dankert
+// Vorbelegung fuer "list"-Element
+//
+// Revision 1.10 2005/01/04 19:58:22 dankert
// Bei Datum auch Default-Text als Eigenschaft
//
// Revision 1.9 2004/12/26 20:22:03 dankert
@@ -349,7 +352,7 @@ class Element
'number' =>Array('withIcon','allLanguages','writable','decPoint','decimals','thousandSep'),
'link' =>Array('withIcon','allLanguages','writable','folderObjectId','defaultObjectId'),
'date' =>Array('withIcon','allLanguages','writable','dateformat','defaultText'),
- 'list' =>Array('withIcon','allLanguages','writable','folderObjectId'),
+ 'list' =>Array('withIcon','allLanguages','writable','folderObjectId','defaultObjectId'),
'code' =>Array('code'),
'dynamic' =>Array('subtype','code'),
'info' =>Array('subtype'),
