projects / mir.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b92a95c)
no message
authorfh <fh>
Fri, 5 Oct 2001 17:32:43 +0000 (17:32 +0000)
committerfh <fh>
Fri, 5 Oct 2001 17:32:43 +0000 (17:32 +0000)
source/mircoders/servlet/ServletModuleLinksImcs.java patch | blob | history
templates-dist/de/linksimcslist.template patch | blob | history

diff --git a/source/mircoders/servlet/ServletModuleLinksImcs.java b/source/mircoders/servlet/ServletModuleLinksImcs.java
index 9ea67a9..c02e005 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleLinksImcs.java
+++ b/source/mircoders/servlet/ServletModuleLinksImcs.java
@@ -81,9 +81,11 @@ public class ServletModuleLinksImcs extends ServletModule
     try {
 
       theLog.printDebugInfo("-- links_imcs_list: list");
-      EntityList   theList;
+      EntityList   theParentList;
+      EntityList   theImcsList;
       SimpleHash modelRoot = new SimpleHash();
       String       offsetParam = req.getParameter("offset");
+      String where ="";
       int          offset=0;
       PrintWriter out = res.getWriter();
 
@@ -98,8 +100,11 @@ public class ServletModuleLinksImcs extends ServletModule
             offset = Integer.parseInt(req.getParameter("prevoffset"));
           }
       }
-      theList = mainModule.getByWhereClause(null, offset);
-      modelRoot.put("imcsparentlist",HTMLTemplateProcessor.makeSimpleList(theList));
+      theParentList = mainModule.getByWhereClause("to_parent_id=NULL", offset);
+      theImcsList = mainModule.getByWhereClause(null, offset);
+
+      modelRoot.put("parentlist",HTMLTemplateProcessor.makeSimpleList(theParentList));
+      modelRoot.put("imcslist",HTMLTemplateProcessor.makeSimpleList(theImcsList));
       HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateListString, modelRoot, res.getWriter());
 
       } catch (Exception e) {
@@ -111,14 +116,19 @@ public class ServletModuleLinksImcs extends ServletModule
     throws ServletModuleException {
     try {
       SimpleHash modelRoot = new SimpleHash();
-      EntityList   theList;
+      EntityList   parentList;
+      EntityList   parentNamesList;
       int offset = 0;
       String idParam = req.getParameter("id");
+      String where = "";
 
-      theList = mainModule.getByWhereClause("to_parent_id=NULL", offset);
+      parentList = mainModule.getByWhereClause("to_parent_id=NULL", offset);
 
-      modelRoot.put("imcsparentlist",HTMLTemplateProcessor.makeSimpleList(theList));
-      deliver(req, res, mainModule.getById(idParam), modelRoot, templateObjektString);
+      modelRoot.put("imcsparentlist",HTMLTemplateProcessor.makeSimpleList(parentList));
+      modelRoot.put("entity", HTMLTemplateProcessor.makeSimpleHash(mainModule.getById(idParam)));
+
+
+      deliver(req, res, modelRoot, templateObjektString);
 
     } catch(ModuleException e) {
       throw new ServletModuleException(e.toString());
diff --git a/templates-dist/de/linksimcslist.template b/templates-dist/de/linksimcslist.template
index ae0d12b..711b1dc 100755 (executable)
--- a/templates-dist/de/linksimcslist.template
+++ b/templates-dist/de/linksimcslist.template
@@ -4,7 +4,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <include "head.template">
-<if imcsparentlist>
+<if imcslist>
 <table border="0">
   <tr bgcolor="#006600">
     <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
@@ -20,10 +20,14 @@
        <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
                <b>&nbsp;</b></font></td>
   </tr>
-  <list imcsparentlist as entry>
+  <list imcslist as entry>
+  <assign parent = "">
+  <list parentlist as p>
+               <if entry.to_parent_id == p.id><assign parent = p.title></if>
+  </list>
   <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
        <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.title}&nbsp;</font></td>
-       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.to_parent_id}</font></td>
+       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${parent}</font></td>
        <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.url}</font></td>
        <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.sortpriority}</font></td>
        <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.to_language}</font></td>
The Mir CMS