diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt index f3a229d51f98d93914d11a6d880a7de7d02dcea8..aaef32ed485a54b74e36c59229d8a5a28309cdc9 100644 --- a/Code/Mantid/Framework/Kernel/CMakeLists.txt +++ b/Code/Mantid/Framework/Kernel/CMakeLists.txt @@ -473,7 +473,7 @@ set ( ENABLE_USAGE_REPORTS "0" ) set ( PYTHONPLUGIN_DIRS "${MANTID_ROOT}/Framework/PythonInterface/plugins" ) set ( DATADIRS ${ExternalData_BINARY_ROOT}/Testing/Data/UnitTest;${ExternalData_BINARY_ROOT}/Testing/Data/DocTest;${MANTID_ROOT}/instrument ) set ( COLORMAPS_FOLDER ${MANTID_ROOT}/Installers/colormaps/ ) -set ( MANTIDPUBLISHER "http://upload.mantidproject.org/scriptrepository/payload/publish_debug" ) +set ( MANTIDPUBLISHER "http://upload.mantidproject.org/scriptrepository?debug=1" ) set ( HTML_ROOT ${DOCS_BUILDDIR}/html ) # Construct script paths. @@ -550,7 +550,7 @@ set ( UPDATE_INSTRUMENT_DEFINTITIONS "1" ) set ( CHECK_FOR_NEW_MANTID_VERSION "1" ) set ( ENABLE_USAGE_REPORTS "1" ) set ( DATADIRS "" ) -set ( MANTIDPUBLISHER "http://upload.mantidproject.org/scriptrepository/payload/publish" ) +set ( MANTIDPUBLISHER "http://upload.mantidproject.org/scriptrepository" ) set ( HTML_ROOT ../share/doc/html ) # Construct script paths by replacing the old MANTID_ROOT with the new one. diff --git a/Code/Mantid/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp b/Code/Mantid/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp index bdb5e8d45e01f4cfcd9bbef064f849b007255db5..2726cf70e7c25c570322700021693f6383812521 100644 --- a/Code/Mantid/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp +++ b/Code/Mantid/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp @@ -1010,10 +1010,8 @@ void ScriptRepositoryImpl::remove(const std::string &file_path, // prepare the request, and call doDeleteRemoteFile to request the server to // remove the file - std::string remote_delete = remote_upload; - boost::replace_all(remote_delete, "publish", "remove"); std::stringstream answer; - answer << doDeleteRemoteFile(remote_delete, file_path, author, email, + answer << doDeleteRemoteFile(remote_upload, file_path, author, email, comment); g_log.debug() << "Answer from doDelete: " << answer.str() << std::endl; diff --git a/Code/Mantid/MantidPlot/src/ApplicationWindow.h b/Code/Mantid/MantidPlot/src/ApplicationWindow.h index 4b011e51ed005cc442a2d8b0fbd6cae6c95fc8c0..7f37e7f6868ced08195ed03a8232ca7a94d929d9 100644 --- a/Code/Mantid/MantidPlot/src/ApplicationWindow.h +++ b/Code/Mantid/MantidPlot/src/ApplicationWindow.h @@ -1092,8 +1092,6 @@ private: void openScriptWindow (const QStringList& lines); //@} - ApplicationWindow* loadScript(const QString& fn, bool existingProject = false); - private slots: //! \name Initialization //@{ @@ -1186,6 +1184,8 @@ private slots: bool shouldWeShowFirstTimeSetup(const QStringList& commandArguments); /// Open up the FirstRunSetup dialog void showFirstTimeSetup(); + + ApplicationWindow* loadScript(const QString& fn, bool existingProject = false); public: // TODO: a lot of this stuff should be private