extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 01:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

If app has no filterable fields, skip that step

Browse Source
This commit is contained in:
Nathan Gray 2013-01-09 19:42:21 +00:00
parent 19757ba8bf
commit 270d8a9145
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
importexport/inc/class.importexport_definitions_ui.inc.php
View File

@ -21,6 +21,9 @@ class importexport_definitions_ui
const _appname = 'importexport'; const _appname = 'importexport';
// To skip a step, step returns this
const SKIP = '-skip-';
public $public_functions = array( public $public_functions = array(
'edit' => true, 'edit' => true,
'index' => true, 'index' => true,
@ -569,14 +572,28 @@ class importexport_definitions_ui
if(!$content['name'] || !$content['type'] || !$content['plugin']) { if(!$content['name'] || !$content['type'] || !$content['plugin']) {
$GLOBALS['egw']->js->set_onload("disable_button('exec[button][finish]');"); $GLOBALS['egw']->js->set_onload("disable_button('exec[button][finish]');");
} }
if(!key_exists($next_step,$this->steps)) do {
{ if(!key_exists($next_step,$this->steps))
$this->wizard_content_template = $this->plugin->$next_step($content,$sel_options,$readonlys,$preserv); {
} $this->wizard_content_template = $this->plugin->$next_step($content,$sel_options,$readonlys,$preserv);
else }
{ else
$this->wizard_content_template = $this->$next_step($content,$sel_options,$readonlys,$preserv); {
} $this->wizard_content_template = $this->$next_step($content,$sel_options,$readonlys,$preserv);
}
if($this->wizard_content_template == self::SKIP)
{
if(!key_exists($content['step'],$this->steps))
{
$next_step = $this->plugin->$content['step']($content);
}
else
{
$next_step = $this->$content['step']($content);
}
}
} while($this->wizard_content_template == self::SKIP);
if(!$this->can_edit($content)) if(!$this->can_edit($content))
{ {
$readonlys[$this->wizard_content_template] = true; $readonlys[$this->wizard_content_template] = true;

5
importexport/inc/class.importexport_wizard_basic_export_csv.inc.php
View File

@ -283,6 +283,11 @@ class importexport_wizard_basic_export_csv
} }
} }
if(!$content['set_filter']['fields'])
{
// No fields
return importexport_definitions_ui::SKIP;
}
$sel_options = array(); $sel_options = array();
$preserv = $content; $preserv = $content;