Skip to content
Snippets Groups Projects
Commit 13a0818f authored by Jakob Sack's avatar Jakob Sack
Browse files

Be more precise regarding backgroundjobs mode

parent 7fa89697
Branches
No related tags found
No related merge requests found
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
$RUNTIME_NOSETUPFS = true; $RUNTIME_NOSETUPFS = true;
require_once('lib/base.php'); require_once('lib/base.php');
$appmode = OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'web' ); $appmode = OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'ajax' );
if( OC::$CLI ){ if( OC::$CLI ){
if( $appmode == 'web' ){ if( $appmode != 'cron' ){
OC_Appconfig::setValue( 'core', 'backgroundjob_mode', 'cron' ); OC_Appconfig::setValue( 'core', 'backgroundjob_mode', 'cron' );
} }
...@@ -41,7 +41,7 @@ if( OC::$CLI ){ ...@@ -41,7 +41,7 @@ if( OC::$CLI ){
OC_BackgroundJob_Worker::doAllSteps(); OC_BackgroundJob_Worker::doAllSteps();
} }
else{ else{
if( $appmode == 'web' ){ if( $appmode == 'cron' ){
OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!'))); OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
exit(); exit();
} }
......
...@@ -227,11 +227,17 @@ class OC{ ...@@ -227,11 +227,17 @@ class OC{
OC_Util::addScript( "jquery.infieldlabel.min" ); OC_Util::addScript( "jquery.infieldlabel.min" );
OC_Util::addScript( "jquery-tipsy" ); OC_Util::addScript( "jquery-tipsy" );
OC_Util::addScript( "oc-dialogs" ); OC_Util::addScript( "oc-dialogs" );
OC_Util::addScript( "backgroundjobs" );
OC_Util::addScript( "js" ); OC_Util::addScript( "js" );
OC_Util::addScript( "eventsource" ); OC_Util::addScript( "eventsource" );
OC_Util::addScript( "config" ); OC_Util::addScript( "config" );
//OC_Util::addScript( "multiselect" ); //OC_Util::addScript( "multiselect" );
OC_Util::addScript('search','result'); OC_Util::addScript('search','result');
if( OC_Appconfig::getValue( 'core', 'backgroundjob_mode', 'ajax' ) == 'ajax' ){
OC_Util::addScript( 'backgroundjobs' );
}
OC_Util::addStyle( "styles" ); OC_Util::addStyle( "styles" );
OC_Util::addStyle( "multiselect" ); OC_Util::addStyle( "multiselect" );
OC_Util::addStyle( "jquery-ui-1.8.16.custom" ); OC_Util::addStyle( "jquery-ui-1.8.16.custom" );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment