[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-runtime/KDE/4.9] nepomuk/kioslaves/nepomuk: Fixed the delete action.
From:       Sebastian Trueg <trueg () kde ! org>
Date:       2012-08-22 11:35:21
Message-ID: 20120822113521.CB083A6042 () git ! kde ! org
[Download RAW message or body]

Git commit 8a71f3765bd5fd5dd09cc34cf114c9424e7c7dd7 by Sebastian Trueg.
Committed on 22/08/2012 at 11:54.
Pushed by trueg into branch 'KDE/4.9'.

Fixed the delete action.

M  +15   -15   nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp
M  +1    -1    nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp

http://commits.kde.org/kde-runtime/8a71f3765bd5fd5dd09cc34cf114c9424e7c7dd7

diff --git a/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp \
b/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp index f350110..2ef666f 100644
--- a/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp
+++ b/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp
@@ -111,7 +111,18 @@ void Nepomuk2::NepomukProtocol::get( const KUrl& url )
     const bool noFollow = noFollowSet( url );
 
     Nepomuk2::Resource res = splitNepomukUrl( url );
-    if ( !noFollow && Nepomuk2::isRemovableMediaFile( res ) ) {
+
+    if ( url.hasQueryItem( QLatin1String( "action") ) &&
+         url.queryItem( QLatin1String( "action" ) ) == QLatin1String( "delete" ) &&
+         messageBox( i18n( "Do you really want to delete the resource and all \
relations " +                           "to and from it?" ),
+                     KIO::SlaveBase::QuestionYesNo,
+                     i18n( "Delete Resource" ) ) == KMessageBox::Yes ) {
+        res.remove();
+        data( "<html><body><p>Resource has been deleted from the Nepomuk \
storage.</p></body></html>" ); +        finished();
+    }
+    else if ( !noFollow && Nepomuk2::isRemovableMediaFile( res ) ) {
         error( KIO::ERR_SLAVE_DEFINED,
                i18nc( "@info", "Please insert the removable medium \
                <resource>%1</resource> to access this file.",
                       getFileSystemLabelForRemovableMediaFileUrl( res ) ) );
@@ -130,20 +141,9 @@ void Nepomuk2::NepomukProtocol::get( const KUrl& url )
             return;
         }
 
-        if ( url.hasQueryItem( QLatin1String( "action") ) &&
-             url.queryItem( QLatin1String( "action" ) ) == QLatin1String( "delete" ) \
                &&
-             messageBox( i18n( "Do you really want to delete the resource and all \
                relations "
-                               "to and from it?" ),
-                         KIO::SlaveBase::QuestionYesNo,
-                         i18n( "Delete Resource" ) ) == KMessageBox::Yes ) {
-            res.remove();
-            data( "<html><body><p>Resource has been deleted from the Nepomuk \
                storage.</p></body></html>" );
-        }
-        else {
-            ResourcePageGenerator gen( res );
-            gen.setFlagsFromUrl( url );
-            data( gen.generatePage() );
-        }
+        ResourcePageGenerator gen( res );
+        gen.setFlagsFromUrl( url );
+        data( gen.generatePage() );
         finished();
     }
 }
diff --git a/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp \
b/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp index ccb9a3d..f1c786c 100644
--- a/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp
+++ b/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp
@@ -264,7 +264,7 @@ QByteArray Nepomuk2::ResourcePageGenerator::generatePage() const
 
     if ( exists ) {
         os << "<h2>" << i18n("Actions:") << "</h2>"
-           << "<div id=\"relations\"><a href=\"" << KUrl( m_resource.uri() ).url() \
<< "?action=delete\">" << i18n( "Delete resource" ) << "</a></div>"; +           << \
"<div id=\"relations\"><a href=\"" << KUrl( m_resource.uri() ).url() << \
"?noFollow=true&action=delete\">" << i18n( "Delete resource" ) << "</a></div>";  }
 
     os << "</div></div></div></div></body></html>";


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic