ImageStepEdit

Reihenfolge für das Formular geändert. Die Auswahl der bereits vorhandenen Bilder kommt nun zuerst. Dort ist der Link zum Upload. Die Upload-Seite hat nun keinen Link mehr auf die Auswahl-Seite, um Schleifen zu vermeiden.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1752 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2012-07-05 08:24:32 +00:00
parent 256434cad0
commit c82117ef63
1 changed files with 6 additions and 1 deletions

View File

@ -113,7 +113,7 @@ public class ImageStepEdit extends SimpleContainer
Object key = i.next(); Object key = i.next();
Component component = (Component) componentsMap.get( key ); Component component = (Component) componentsMap.get( key );
p.setVisibleDefault( component, UPLOAD.equals( key ) ); p.setVisibleDefault( component, LIBRARY.equals( key ) );
} }
p.addComponentStateParam( this, m_imageComponentKey ); p.addComponentStateParam( this, m_imageComponentKey );
@ -276,6 +276,10 @@ public class ImageStepEdit extends SimpleContainer
m_saveCancel = new SaveCancelSection(); m_saveCancel = new SaveCancelSection();
add(m_saveCancel); add(m_saveCancel);
/* Removed by Quasimodo: Changed editing workflow, so that library comes first
* Also, library mode has now a link to upload images whixh will link to this
* form. Consequently, this link will create a loop, which isn't fatal but
* confusing
ActionLink library = new ActionLink( "Select an existing image" ); ActionLink library = new ActionLink( "Select an existing image" );
library.addActionListener( new ActionListener() { library.addActionListener( new ActionListener() {
public void actionPerformed( ActionEvent ev ) { public void actionPerformed( ActionEvent ev ) {
@ -283,6 +287,7 @@ public class ImageStepEdit extends SimpleContainer
} }
} ); } );
add( library, ColumnPanel.FULL_WIDTH ); add( library, ColumnPanel.FULL_WIDTH );
*/
} }
public SaveCancelSection getSaveCancelSection() { public SaveCancelSection getSaveCancelSection() {