Project

General

Profile

« Previous | Next » 

Revision ed33cbd7

Added by Katja Luther almost 7 years ago

ref #6527: change the labels for media deletion config and remove undeletable media from gallery

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
202 202
OpenDerivativeEditorForTaxonNode_COULD_NOT_OPEN=Specimen-Editor konnte nicht ge?ffnet werden
203 203
DeleteDescriptionElementOperation_DESC_NOT_FOUND=Beschreibung konnte nicht gefunden werden!
204 204
DeleteHandler_CONFIRM_DELETION=L?schen best?tigen
205
DeleteHandler_CONFIRM_DELETION_MESSAGE=Wollen sie wirklich das Medienobjekt l?schen?
205
DeleteHandler_CONFIRM_DELETION_MESSAGE=Wollen sie die Mediendaten wirklich l?schen?
206 206
DeleteHandler_DELETE=L?schen
207 207
DeleteHandler_INVALID_SELECTION=Auswahl ung?ltig f?r den DeleteHandler
208 208
DeleteHandler_SKIP=?berspringen
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
102 102

  
103 103
					// TODO use undo context specific to editor
104 104
                    MediaDeletionConfigurator config = new MediaDeletionConfigurator();
105
                    config.setDeleteIfUsedInTaxonDescription(true);
106
                    config.setOnlyRemoveFromGallery(false);
105 107

  
106 108
                    if (!DeleteConfiguratorDialog.openConfirmWithConfigurator(config, HandlerUtil.getActiveShell(event), Messages.DeleteHandler_CONFIRM_DELETION,  Messages.DeleteHandler_CONFIRM_DELETION_MESSAGE)){
107 109
                        return null;
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java
76 76
		monitor.worked(20);
77 77
		DeleteResult result = CdmStore.getService(IMediaService.class).delete(media.getUuid(), config);
78 78
		String errorMessage = "The media ";
79
		if (result.isOk()){
80
			ImagesUtility.removeMediaFromGallery(description, media);
81
		} else{
79
		ImagesUtility.removeMediaFromGallery(description, media);
80
		if (!result.isOk()){
82 81
			List<String> messages = new ArrayList<String>();
83 82
			int i = result.getExceptions().size();
84 83
			for (Exception e:result.getExceptions()){
85 84
				messages.add(e.getMessage());
86 85
			}
87
			errorMessage += "could not be deleted.";
86
			errorMessage += "could not be deleted from database. ";
88 87
			//MessagingUtils.errorDialog("test", getClass(), "message", TaxeditorBulkeditorPlugin.PLUGIN_ID, result.getExceptions().iterator().next(),true);
89 88
			DeleteResultMessagingUtils.messageDialogWithDetails(result,errorMessage, TaxeditorBulkeditorPlugin.PLUGIN_ID);
90 89
		}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
139 139
DeleteConfiguration_media_removeFromGallery=Remove the media from the image gallery but leave it in database
140 140
DeleteConfiguration_media_deleteIfUsedInTaxonDescription=Delete also if media is used in taxon description
141 141
DeleteConfiguration_media_deleteIfUsedInSpecimenDescription=Delete also if media is used in specimen description        
142
DeleteConfiguration_media_delete=Delete the media completely, if possible
142
DeleteConfiguration_media_delete=Remove the media from the image gallery and delete the media completely, if possible
143 143

  
144 144
NewGrantedAuthority_AlreadyInDb=The granted authority already exists.
145 145

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
139 139
DeleteConfiguration_media_removeFromGallery=Entferne Mediendaten aus der Gallerie, aber behalte es in der Datenbank
140 140
DeleteConfiguration_media_deleteIfUsedInTaxonDescription=L?sche die Mediendaten, auch wenn es Teil einer Taxonbeschreibung ist
141 141
DeleteConfiguration_media_deleteIfUsedInSpecimenDescription=L?sche die Mediendaten, auch wenn es Teil einer Specimenbeschreibung ist
142
DeleteConfiguration_media_delete=L?sche die Mediendaten, wenn es nicht von anderen Daten referenziert wird.
142
DeleteConfiguration_media_delete=Entferne die Mediendaten aus der Gallerie und l?sche sie aus der Datenbank, wenn sie nicht anderweitig verwendet werden.
143 143

  
144 144
NewGrantedAuthority_AlreadyInDb=Die GrantedAuthority ist bereits in der DB enthalten.
145 145

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/deleteConfigurator/DeleteMediaConfiguratorComposite.java
84 84
//            });
85 85
            btnRemoveFromImageGallery = new Button(this, SWT.RADIO);
86 86
            btnRemoveFromImageGallery.setText(Messages.DeleteConfiguration_media_removeFromGallery);
87
            btnDelete.setSelection(true);
88
        	btnRemoveFromImageGallery.setSelection(configurator.isOnlyRemoveFromGallery());
87
            btnRemoveFromImageGallery.setSelection(configurator.isOnlyRemoveFromGallery());
88
        	btnDelete.setSelection(configurator.isDeleteIfUsedInTaxonDescription());
89 89
        }
90 90

  
91 91
        m_bindingContext = initDataBindings();

Also available in: Unified diff