Commit 89599d25 authored by Adrien's avatar Adrien Committed by Romain Bioteau

fix(profile) custom profile referencing user process list (#1438)

* The user process list is now a custom page -> it has a new id. We only
want to propose the new id in the profile editor portal menu proposal.
* Ensure that the engine is started before to retrieve portal default
pages (broke with the work done to start the engine in background when
required apparently)
parent 3dc48fdd
......@@ -411,7 +411,7 @@ public class BonitaStudioWorkbenchAdvisor extends WorkbenchAdvisor implements IS
executeContributions();
}
protected void initXMLandHTMLValidationPreferences() {
IEclipsePreferences xmlNode = new DefaultScope().getNode(XMLCorePlugin.getDefault().getBundle().getSymbolicName());
xmlNode.putInt(XMLCorePreferenceNames.INDICATE_NO_GRAMMAR, -1);
......@@ -425,7 +425,6 @@ public class BonitaStudioWorkbenchAdvisor extends WorkbenchAdvisor implements IS
htmlNode.putInt(HTMLCorePreferenceNames.ELEM_UNKNOWN_NAME, -1);
}
protected void disableGroovyDSL() {
final IPreferenceStore groovyDSLstore = GroovyDSLCoreActivator.getDefault().getPreferenceStore();
groovyDSLstore.setDefault(DSLPreferencesInitializer.AUTO_ADD_DSL_SUPPORT, false);
......@@ -436,7 +435,6 @@ public class BonitaStudioWorkbenchAdvisor extends WorkbenchAdvisor implements IS
groovyDSLstore.setValue(DSLPreferences.DISABLED_SCRIPTS, false);
}
private void executeContributions() {
final IConfigurationElement[] elements = BonitaStudioExtensionRegistryManager.getInstance().getConfigurationElements(
"org.bonitasoft.studio.common.repository.postinitrepository"); //$NON-NLS-1$
......@@ -522,12 +520,8 @@ public class BonitaStudioWorkbenchAdvisor extends WorkbenchAdvisor implements IS
try {
if (PlatformUI.isWorkbenchRunning() && PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null
&& PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() != null) {
final boolean closeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.saveAllEditors(true);
if (closeEditor) {
PlatformUI.getWorkbench().getProgressService().run(true, false, new PreShutdownStudio());
}
return closeEditor;
PlatformUI.getWorkbench().getProgressService().run(true, false, new PreShutdownStudio());
return true;
}
} catch (final Exception e) {
BonitaStudioLog.error(e);
......
......@@ -16,7 +16,7 @@ exporting = Exporting...
exportSuccessTitle = Build successful
exportSuccessMsg=Build has ended successfully !
initializingUserXP = Initializing Portal...
waitingForEngineToStart=First run\: waiting for engine to load...
waitingForEngineToStart=Waiting for server to startup...
enablingProcess = Enabling {0}...
undeploying = Removing previous definition of {0}
selectProcessToExport = Select processes to export
......
......@@ -25,10 +25,6 @@ public class LoginRequest extends HttpRequest<String> {
super(httpClientFactory);
}
/*
* (non-Javadoc)
* @see org.bonitasoft.studio.rest.api.extension.core.remote.http.HttpRequest#doExecute(org.apache.http.impl.client.CloseableHttpClient)
*/
@Override
protected String doExecute(final HttpClient httpClient) throws IOException, HttpException {
HttpGet loginRequest;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment