From 876e1d73283b8328db77599da2fac401619a3f40 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 7 May 2007 13:36:41 +0000 Subject: [PATCH] Fixed filtering problems git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6280 594d385d-05f5-0310-b6e9-bd551577e9d8 --- setup/class_setupStep_Migrate.inc | 2 +- setup/setup_migrate.tpl | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc index 37955aec0..303c24f85 100644 --- a/setup/class_setupStep_Migrate.inc +++ b/setup/class_setupStep_Migrate.inc @@ -408,7 +408,7 @@ class Step_Migrate extends setup_step if(count($this->outside_users)){ $this->checks['outside_users']['STATUS'] = FALSE; - $this->checks['outside_users']['STATUS_MSG']= _("Failed"); + $this->checks['outside_users']['STATUS_MSG']= ""._("Warning").""; $this->checks['outside_users']['ERROR_MSG'] = sprintf(_("Found %s user(s) outside the selected user ou '%s'."),count($this->outside_users),$people_ou); $this->checks['outside_users']['ERROR_MSG'].= ""; diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl index 99d781589..8bcf7ddbb 100644 --- a/setup/setup_migrate.tpl +++ b/setup/setup_migrate.tpl @@ -127,13 +127,13 @@ {elseif $method == "outside_users"} -

{t}Move users into valid user departments{/t}

- - {t}This dialog allows you to move the displayed users into a valid user department{/t} -
- {t}Be careful with this tool, there may be references pointing to this user that can't be migrated.{/t} -
-
+

{t}Move users into configured user tree{/t}

+

+ {t}This dialog allows moving a couple of users to the configured user tree.{/t} +

+

+ {t}Be careful with this option! There may be references pointing to these users. The setup can't migrate references, so you may want to abort in this case.{/t} +

{foreach from=$outside_users item=val key=key} {if $outside_users.$key.selected} @@ -161,14 +161,15 @@ {html_options options=$ous}
- - +

 

-
- +
+ +   +
-- 2.30.2