added a link to comments/articles from media

diff --git a/bundles/admin_en.properties b/bundles/admin_en.properties
index 94ed8e7..6124056 100755 (executable)
--- a/bundles/admin_en.properties
+++ b/bundles/admin_en.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: english
-# $Id: admin_en.properties,v 1.48.2.9 2003/09/03 17:49:37 zapata Exp $
+# $Id: admin_en.properties,v 1.48.2.10 2003/09/06 01:01:13 zapata Exp $
 
 languagename=English
 
@@ -67,6 +67,8 @@ media.is_published=published
 media.icon=icon
 media.nr_of_media=Number of Media Items (max 20)
 media.nr_of_media.submit=define number
+media.comments=Comments 
+media.articles=Articles
 
 medialist.search_text_in=Search text in
 

diff --git a/source/mir/servlet/ServletModule.java b/source/mir/servlet/ServletModule.java
index 42519db..5ddb42d 100755 (executable)
--- a/source/mir/servlet/ServletModule.java
+++ b/source/mir/servlet/ServletModule.java
@@ -258,6 +258,15 @@ public abstract class ServletModule {
     }\r
   }\r
 \r
+  public void editObject(HttpServletRequest aRequest, HttpServletResponse aResponse, String anId) throws ServletModuleExc {\r
+    try {\r
+      editObject(aRequest, aResponse, model.makeEntityAdapter(definition, mainModule.getById(anId)), false, anId);\r
+    }\r
+    catch (Throwable t) {\r
+      throw new ServletModuleFailure(t);\r
+    }\r
+  }\r
+\r
   public void editObject(HttpServletRequest aRequest, HttpServletResponse aResponse, Object anObject, boolean anIsNew, String anId) throws ServletModuleExc {\r
     HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);\r
     URLBuilder urlBuilder = new URLBuilder();\r

diff --git a/source/mircoders/module/ModuleImages.java b/source/mircoders/module/ModuleImages.java
index 5ba3864..b20d989 100755 (executable)
--- a/source/mircoders/module/ModuleImages.java
+++ b/source/mircoders/module/ModuleImages.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package mircoders.module;
@@ -40,18 +40,5 @@ public class ModuleImages extends AbstractModule {
     if (theStorage == null)
       logger.warn("ModuleImages: StorageObject was null!");
     this.theStorage = theStorage;
-
-  }
-
-// Methoden
-/*
-  public SimpleList getBilderAsSimpleList() throws ModuleExc, ModuleFailure {
-    try {
-      return ((DatabaseImages)theStorage).getPopupData();
-    }
-    catch  (StorageObjectFailure e) {
-      throw new ModuleException(e.toString());
-    }
   }
-*/
 }

diff --git a/source/mircoders/servlet/ServletModuleComment.java b/source/mircoders/servlet/ServletModuleComment.java
index 251c37c..96f7232 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleComment.java
+++ b/source/mircoders/servlet/ServletModuleComment.java
@@ -101,10 +101,10 @@ public class ServletModuleComment extends ServletModule
     if (idParam == null)\r
       throw new ServletModuleExc("Invalid call: id not supplied ");\r
 \r
-    showComment(idParam, aRequest, aResponse);\r
+    editObject(aRequest, aResponse, idParam);\r
   }\r
 \r
-  public void showComment(String anId, HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {\r
+  public void editObject(HttpServletRequest aRequest, HttpServletResponse aResponse, String anId) throws ServletModuleExc {\r
     try {\r
       HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);\r
       Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)});\r
@@ -157,7 +157,7 @@ public class ServletModuleComment extends ServletModule
       throw new ServletModuleFailure(e);\r
     }\r
 \r
-    showComment(commentId, aRequest, aResponse);\r
+    editObject(aRequest, aResponse, commentId);\r
   }\r
 \r
   public void dettach(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc\r
@@ -177,7 +177,7 @@ public class ServletModuleComment extends ServletModule
       throw new ServletModuleFailure(e);\r
     }\r
 \r
-    showComment(commentId, aRequest, aResponse);\r
+    editObject(aRequest, aResponse, commentId);\r
   }\r
 \r
 \r
@@ -189,7 +189,7 @@ public class ServletModuleComment extends ServletModule
     String order = requestParser.getParameterWithDefault("order", "webdb_create desc");\r
     int offset = requestParser.getIntegerWithDefault("offset", 0);\r
 \r
-    returnCommentList(aRequest, aResponse, where, order, offset);\r
+    returnList(aRequest, aResponse, where, order, offset);\r
   }\r
 \r
   public void search(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc\r
@@ -232,7 +232,7 @@ public class ServletModuleComment extends ServletModule
         queryBuilder.appendDescendingOrder("creator");\r
     }\r
 \r
-    returnCommentList(aRequest, aResponse, queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), 0);\r
+    returnList(aRequest, aResponse, queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), 0);\r
   }\r
 \r
   public void articlecomments(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc\r
@@ -243,14 +243,14 @@ public class ServletModuleComment extends ServletModule
     try {\r
       articleId  = Integer.parseInt(articleIdString);\r
 \r
-      returnCommentList( aRequest, aResponse, "to_media="+articleId, "webdb_create desc", 0);\r
+      returnList( aRequest, aResponse, "to_media="+articleId, "webdb_create desc", 0);\r
     }\r
     catch (Throwable e) {\r
       throw new ServletModuleFailure(e);\r
     }\r
   }\r
 \r
-  public void returnCommentList(HttpServletRequest aRequest, HttpServletResponse aResponse,\r
+  public void returnList(HttpServletRequest aRequest, HttpServletResponse aResponse,\r
      String aWhereClause, String anOrderByClause, int anOffset) throws ServletModuleExc {\r
 \r
     HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);\r
@@ -346,7 +346,7 @@ public class ServletModuleComment extends ServletModule
         redirect(aResponse, returnUrl);\r
       }\r
       else\r
-        showComment(idParam, aRequest, aResponse);\r
+        editObject(aRequest, aResponse, idParam);\r
     }\r
     catch (Throwable e) {\r
       throw new ServletModuleFailure(e);\r

diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java
index 87506c0..9b7ac19 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleContent.java
+++ b/source/mircoders/servlet/ServletModuleContent.java
@@ -61,7 +61,7 @@ import mircoders.storage.DatabaseContentToTopics;
  *  ServletModuleContent -\r
  *  deliver html for the article admin form.\r
  *\r
- * @version $Id: ServletModuleContent.java,v 1.52.2.6 2003/09/03 17:49:40 zapata Exp $\r
+ * @version $Id: ServletModuleContent.java,v 1.52.2.7 2003/09/06 01:01:15 zapata Exp $\r
  * @author rk, mir-coders\r
  *\r
  */\r
@@ -93,7 +93,7 @@ public class ServletModuleContent extends ServletModule
     int offset = requestParser.getIntegerWithDefault("offset", 0);\r
     String selectArticleUrl = requestParser.getParameter("selectarticleurl");\r
 \r
-    returnArticleList(aRequest, aResponse, where, order, offset, selectArticleUrl);\r
+    returnList(aRequest, aResponse, where, order, offset, selectArticleUrl);\r
   }\r
 \r
   public void search(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc, ServletModuleFailure {\r
@@ -143,7 +143,7 @@ public class ServletModuleContent extends ServletModule
           queryBuilder.appendAscendingOrder("creator");\r
       }\r
 \r
-      returnArticleList(aRequest, aResponse, queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), 0, selectArticleUrl);\r
+      returnList(aRequest, aResponse, queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), 0, selectArticleUrl);\r
     }\r
     catch (Throwable e) {\r
       throw new ServletModuleFailure(e);\r
@@ -151,7 +151,7 @@ public class ServletModuleContent extends ServletModule
   }\r
 \r
   public void add(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {\r
-    _showObject(null, aRequest, aResponse);\r
+    editObject(aRequest, aResponse, null);\r
   }\r
 \r
 \r
@@ -180,7 +180,7 @@ public class ServletModuleContent extends ServletModule
 \r
       DatabaseContentToTopics.getInstance().setTopics(id, aRequest.getParameterValues("to_topic"));\r
 \r
-      _showObject(id, aRequest, aResponse);\r
+      editObject(aRequest, aResponse, id);\r
     }\r
     catch (Throwable e) {\r
       throw new ServletModuleFailure(e);\r
@@ -192,7 +192,7 @@ public class ServletModuleContent extends ServletModule
     String idParam = aRequest.getParameter("id");\r
     if (idParam == null)\r
       throw new ServletModuleExc("Invalid call: id not supplied ");\r
-    _showObject(idParam, aRequest, aResponse);\r
+    editObject(aRequest, aResponse, idParam);\r
   }\r
 \r
 // methods for attaching media file\r
@@ -212,7 +212,7 @@ public class ServletModuleContent extends ServletModule
       throw new ServletModuleFailure(e);\r
     }\r
 \r
-    _showObject(articleId, aRequest, aResponse);\r
+    editObject(aRequest, aResponse, articleId);\r
   }\r
 \r
   public void dettach(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc\r
@@ -232,7 +232,7 @@ public class ServletModuleContent extends ServletModule
       throw new ServletModuleFailure(e);\r
     }\r
 \r
-    _showObject(articleId, aRequest, aResponse);\r
+    editObject(aRequest, aResponse, articleId);\r
   }\r
 \r
   public void update(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc\r
@@ -267,7 +267,7 @@ public class ServletModuleContent extends ServletModule
         redirect(aResponse, returnUrl);\r
       }\r
       else\r
-        _showObject(idParam, aRequest, aResponse);\r
+        editObject(aRequest, aResponse, idParam);\r
     }\r
     catch (Throwable e) {\r
       throw new ServletModuleFailure(e);\r
@@ -286,7 +286,7 @@ public class ServletModuleContent extends ServletModule
    * @param aResponse\r
    * @throws ServletModuleExc\r
    */\r
-  public void _showObject(String id, HttpServletRequest aRequest, HttpServletResponse aResponse)\r
+  public void editObject(HttpServletRequest aRequest, HttpServletResponse aResponse, String id)\r
       throws ServletModuleExc {\r
     try {\r
       HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);\r
@@ -333,7 +333,12 @@ public class ServletModuleContent extends ServletModule
     }\r
   }\r
 \r
-  public void returnArticleList(\r
+  public void returnList(HttpServletRequest aRequest, HttpServletResponse aResponse,\r
+     String aWhereClause, String anOrderByClause, int anOffset) throws ServletModuleExc {\r
+    this.returnList(aRequest, aResponse, aWhereClause, anOrderByClause, anOffset, null);\r
+  }\r
+\r
+  public void returnList(\r
        HttpServletRequest aRequest,\r
        HttpServletResponse aResponse,\r
        String aWhereClause,\r
@@ -422,7 +427,7 @@ public class ServletModuleContent extends ServletModule
       urlBuilder.setValue("childid", requestParser.getParameter("id"));\r
       urlBuilder.setValue("returnurl", requestParser.getParameter("returnurl"));\r
 \r
-      returnArticleList(aRequest, aResponse, "", "", 0, urlBuilder.getQuery());\r
+      returnList(aRequest, aResponse, "", "", 0, urlBuilder.getQuery());\r
     }\r
     catch (Throwable e) {\r
       throw new ServletModuleFailure(e);\r
@@ -438,7 +443,7 @@ public class ServletModuleContent extends ServletModule
       if (articleId == null)\r
         throw new ServletModuleExc("ServletModuleContent.listchildren: article_id not set!");\r
 \r
-      returnArticleList(aRequest, aResponse, "to_content = " + articleId, "", 0, null);\r
+      returnList(aRequest, aResponse, "to_content = " + articleId, "", 0, null);\r
     }\r
     catch (Throwable e) {\r
       throw new ServletModuleFailure(e);\r

diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java
index 6dddfa7..e684af8 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleUploadedMedia.java
+++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java
@@ -146,7 +146,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
           entContent.attach(((EntityUploadedMedia) i.next()).getId());\r
         }\r
 \r
-        ((ServletModuleContent) ServletModuleContent.getInstance())._showObject(articleid, aRequest, aResponse);\r
+        ((ServletModuleContent) ServletModuleContent.getInstance()).editObject(aRequest, aResponse, articleid);\r
 \r
         return;\r
       }\r
@@ -160,7 +160,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
           comment.attach( ( (EntityUploadedMedia) i.next()).getId());\r
         }\r
 \r
-        ((ServletModuleComment) ServletModuleComment.getInstance()).showComment(commentid, aRequest, aResponse);\r
+        ((ServletModuleComment) ServletModuleComment.getInstance()).editObject(aRequest, aResponse, commentid);\r
 \r
         return;\r
       }\r
@@ -408,6 +408,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
         responseData.put("articleid", null);\r
         responseData.put("commentid", null);\r
         responseData.put("returnurl", null);\r
+        responseData.put("thisurl", null);\r
 \r
         responseData.put("edittemplate", editGenerator);\r
         responseData.put("module", moduleName);\r
@@ -504,4 +505,43 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
       throw new ServletModuleFailure(t);\r
     }\r
   }\r
+\r
+  public void showarticles(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc\r
+  {\r
+    String idParam = aRequest.getParameter("id");\r
+    if (idParam!=null && !idParam.equals("")) {\r
+      try {\r
+        EntityUploadedMedia entity = (EntityUploadedMedia) mainModule.getById(idParam);\r
+\r
+        ServletModuleContent.getInstance().returnList(\r
+            aRequest,\r
+            aResponse,\r
+            "exists (select * from content_x_media where content_id=content.id and media_id=" + JDBCStringRoutines.escapeStringLiteral( idParam ) + ")", "", 0);\r
+      }\r
+      catch (Throwable t) {\r
+        throw new ServletModuleFailure(t);\r
+      }\r
+    }\r
+    else logger.error("showarticles: id not specified.");\r
+  }\r
+\r
+  public void showcomments(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc\r
+  {\r
+    String idParam = aRequest.getParameter("id");\r
+    if (idParam!=null && !idParam.equals("")) {\r
+      try {\r
+        EntityUploadedMedia entity = (EntityUploadedMedia) mainModule.getById(idParam);\r
+\r
+        ServletModuleComment.getInstance().returnList(\r
+            aRequest,\r
+            aResponse,\r
+            "exists (select * from comment_x_media where comment_id=comment.id and media_id=" + JDBCStringRoutines.escapeStringLiteral( idParam ) + ")", "", 0);\r
+      }\r
+      catch (Throwable t) {\r
+        throw new ServletModuleFailure(t);\r
+      }\r
+    }\r
+    else logger.error("editObjects: id not specified.");\r
+  }\r
+\r
 }
\ No newline at end of file

diff --git a/templates/admin/image.template b/templates/admin/image.template
index 18ffebe..32dc354 100755 (executable)
--- a/templates/admin/image.template
+++ b/templates/admin/image.template
@@ -16,8 +16,10 @@
       <if uploadedmedia.webdb_lastchange>/ ${lang("media.changed")} ${uploadedmedia.webdb_lastchange}</if><br>
       <if uploadedmedia.is_published=="1">${lang("media.published")}: ${uploadedmedia.publish_date} / ${uploadedmedia.publish_server}${uploadedmedia.publish_path}<br></if>
       ${lang("media.format")}: ${uploadedmedia.mimetype} / ${uploadedmedia.media_descr}<br>
+<comment>      
       ${lang("media.size")}: ${uploadedmedia.human_readable_size}<br>
       ${lang("media.rights")}: <b>${uploadedmedia.rightsHashdata[to_rights]["name"]}</b><br>
+</comment>            
     </td>
   </tr>
 </if>

diff --git a/templates/admin/uploadedmedia.template b/templates/admin/uploadedmedia.template
index 72d0f8a..92dce09 100755 (executable)
--- a/templates/admin/uploadedmedia.template
+++ b/templates/admin/uploadedmedia.template
@@ -43,7 +43,23 @@
       <input type="hidden" name="id" value="${uploadedmedia.id}">
     
       <table border="0">
-    
+      
+        <if new!="1">
+          <tr>
+            <td align="left" valign="top">
+              <call showButton(
+                "module="+module+"&do=showcomments&id="+uploadedmedia.id+"&returnurl="+utility.encodeURI(thisurl),
+                lang("media.comments"))> &nbsp;
+              <call showButton(
+                "module="+module+"&do=showarticles&id="+uploadedmedia.id+"&returnurl="+utility.encodeURI(thisurl),
+                lang("media.articles"))>
+              <br>
+              <br>
+            </td>
+          </tr>
+        </if>
+
+
         <include edittemplate>
       
         <tr><td colspan="2" class="x-small">&nbsp;</td></tr>