Author: tdraier
Date: Wed Sep 26 19:22:36 2007
New Revision: 18679
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18679&repname=
=3Djahia
Log:
trim names, display error message if empty (JAHIA-2402)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/=
ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/admin/sites/ManageSites.java&rev=3D18679&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java Wed Sep 26 19:22:36 2007
@@ -2175,8 +2175,8 @@
importInfos.put("siteServerNameExists", Boolean.TRUE);
} else {
try {
- importInfos.put("siteKeyExists", new Boolean(ServicesR=
egistry.getInstance().getJahiaSitesService().getSiteByKey((String) importIn=
fos.get("sitekey")) !=3D null));
- importInfos.put("siteServerNameExists", new Boolean(Se=
rvicesRegistry.getInstance().getJahiaSitesService().getSite((String) import=
Infos.get("siteservername")) !=3D null));
+ importInfos.put("siteKeyExists", new Boolean(ServicesR=
egistry.getInstance().getJahiaSitesService().getSiteByKey((String) importIn=
fos.get("sitekey")) !=3D null || "".equals(importInfos.get("sitekey"))));
+ importInfos.put("siteServerNameExists", new Boolean(Se=
rvicesRegistry.getInstance().getJahiaSitesService().getSite((String) import=
Infos.get("siteservername")) !=3D null || "".equals(importInfos.get("sitese=
rvername"))));
} catch (JahiaException e) {
e.printStackTrace(); //To change body of catch statem=
ent use File | Settings | File Templates.
}
@@ -2193,9 +2193,9 @@
for (Iterator iterator =3D importsInfos.keySet().iterator(); itera=
tor.hasNext();) {
File file =3D (File) iterator.next();
Map infos =3D (Map) importsInfos.get(file);
- infos.put("sitekey", request.getParameter(file.getName()+"site=
Key"));
- infos.put("siteservername", request.getParameter(file.getName(=
)+"siteServerName"));
- infos.put("sitetitle", request.getParameter(file.getName()+"si=
teTitle"));
+ infos.put("sitekey", request.getParameter(file.getName()+"site=
Key").trim());
+ infos.put("siteservername", request.getParameter(file.getName(=
)+"siteServerName").trim());
+ infos.put("sitetitle", request.getParameter(file.getName()+"si=
teTitle").trim());
infos.put("selected", request.getParameter(file.getName()+"sel=
ected"));
infos.put("templates",request.getParameter(file.getName()+"tem=
plates"));
=
@@ -2204,8 +2204,8 @@
if (infos.get("importFileName").equals("serverPermissi=
ons.xml")) {
=
} else {
- infos.put("siteKeyExists", new Boolean(ServicesReg=
istry.getInstance().getJahiaSitesService().getSiteByKey((String) infos.get(=
"sitekey")) !=3D null));
- infos.put("siteServerNameExists", new Boolean(Serv=
icesRegistry.getInstance().getJahiaSitesService().getSite((String) infos.ge=
t("siteservername")) !=3D null));
+ infos.put("siteKeyExists", new Boolean(ServicesReg=
istry.getInstance().getJahiaSitesService().getSiteByKey((String) infos.get(=
"sitekey")) !=3D null|| "".equals(infos.get("sitekey"))));
+ infos.put("siteServerNameExists", new Boolean(Serv=
icesRegistry.getInstance().getJahiaSitesService().getSite((String) infos.ge=
t("siteservername")) !=3D null || "".equals(infos.get("siteservername"))));
=
if ("".equals(infos.get("sitekey")) || "".equals(i=
nfos.get("siteservername")) || "".equals(infos.get("sitetitle"))) {
// todo display an error message
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
