Index: openacs-4/packages/glossar-portlet/catalog/glossar-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar-portlet/catalog/glossar-portlet.en_US.ISO-8859-1.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/glossar-portlet/catalog/glossar-portlet.en_US.ISO-8859-1.xml	23 Aug 2005 19:39:16 -0000	1.1
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="glossar-portlet" package_version="0.1d" locale="en_US" charset="ISO-8859-1">
+
+  <msg key="glossar_portlet_pretty_name">Glossar Portlet</msg>
+</message_catalog>
Index: openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.adp	23 Aug 2005 19:39:16 -0000	1.1
@@ -0,0 +1,6 @@
+<if @no_perm_p@ eq 1x>
+<p>@no_perm@</p>
+</if>
+<else>
+<listtemplate name="gl_glossar_portlet"></listtemplate>
+</else>  
Index: openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.tcl	23 Aug 2005 19:39:16 -0000	1.1
@@ -0,0 +1,184 @@
+# packages/glossar/lib/glossar-portlet-list.tcl
+#
+# Creates a list of all glossars that belong to this Customer, direct and indirect (Etat)
+#
+# @author Bjoern Kiesbye (bjoern_kiesbye@web.de)
+# @creation-date 2005-07-29
+# @arch-tag: 4324b14c-cb5d-4512-b56d-0e0ab10ff025
+# @cvs-id $Id: glossar-portlet-list.tcl,v 1.1 2005/08/23 19:39:16 miguelm Exp $
+
+foreach required_param {owner_ids} {
+    if {![info exists $required_param]} {
+	return -code error "$required_param is a required parameter."
+    }
+}
+foreach optional_param {gl_format gl_customer_id gl_orderby} {
+    if {![info exists $optional_param]} {
+	set $optional_param {}
+    }
+}
+
+
+set base_url [dotlrn_community::get_community_url \
+		  [dotlrn_community::get_community_id_from_url] \
+		 ]
+
+set glossar_id "0"
+
+set gl_translation_p 0
+set page_size 100
+set base_url "glossar"
+
+if [empty_string_p "[ad_conn user_id]"] {
+    ad_redirect_for_registration
+}
+
+set customer_id [lindex  $owner_ids 0]
+set where_etat_ids [join [lrange $owner_ids 1 [llength $owner_ids]] "','" ] 
+set actions ""
+ns_log notice "WHERE $where_etat_ids , owner $customer_id "
+
+# We check if the owner_id is an relation, if it is, the real_owner_id
+# becomes the eta_id stored in gl_glossars, else it becomes the
+# owner_id which can be a customer_id or a etat_id.
+# We still pass on the owner_id to check permission.
+# Only if the owner_id is an relation we have two id's an etat_id
+# (glossar owner) and an extra custommer_id which is stored in
+# gl_glossar_terms to indicate which terms of a glossar , owned by a
+# etat,  belong to a specific customer.
+# This results into thre possible displays.
+# 1. owner_id is a customer_id (all glossars , owned by customer_id, 
+#    with all terms will be displayed)
+#
+# 2. owner_id is a etat_id (all glossars, owened by etat_id, with all
+#    terms will be displayed, while each term indicates to which
+#    customer(_id) it belongs (happens if the term was added by a
+#    relation), none if it belongs to the etat directly (happens if the
+#    term was added by a etat) )
+#
+# 3. owner_id is a relation_id (all glossars, owned by the etat_id
+#    which is stored in the relations object_id_one column, with all
+#    terms having a customer_id, equal to the relations object_id_two.     
+#    Question: Should it be possible to to display all glossars
+#    owned by the relations object_id_two (custommer_id) including all
+#    terms as well?
+
+
+   
+# This lib file deals with 1. and 2. only.
+
+# No actions just a list of glossars
+
+#set actions [list "[_ glossar.New_Lecture]" [export_vars -base "${base_url}/glossar-add" {owner_id gl_translation_p }] "[_ glossar.New_Lecture]"]
+
+set gl_translation_p 1
+
+#lappend actions "[_ glossar.New_Translation]" [export_vars -base "${base_url}/glossar-add" {owner_id gl_translation_p }] "[_ glossar.Add_New_Translation]" 
+
+
+set row_list [list name title description source_category target_category glossar_edit glossar_files]
+
+# Just check permission on the first owner_id (the current customer) 
+set no_perm_p 0
+
+ad_return_complaint 1 $customer_id
+
+if [permission::permission_p -object_id $customer_id -privilege admin] {
+
+} elseif {[permission::permission_p -object_id $customer_id -privilege create]} {
+
+    set user_perm create
+
+} elseif {[permission::permission_p -object_id $customer_id -privilege read]} {
+
+    set actions ""
+    set row_list [list name title description source_category target_category]
+
+} else {
+
+    set no_perm_p 1
+    set no_perm  "You don't have Permission to read Glossars !"
+
+
+}
+
+set owner_id 0
+if {$no_perm_p == 0} {
+
+template::list::create \
+    -name gl_glossar_portlet \
+    -key glossar_id \
+    -no_data "[_ glossar.None]" \
+    -selected_format $gl_format \
+    -pass_properties {customer_id owner_ids edit_link } \
+    -elements {
+	name {
+	    label {[_ glossar.Organization_Name]}
+	    display_template "<a href=\"@gl_glossar_portlet.new_glossar@\">@gl_glossar_portlet.name@</a>"
+        }
+	title {
+	    label {[_ glossar.Title]}
+	    display_template "<a href=\"@gl_glossar_portlet.title_url@\">@gl_glossar_portlet.title@</a>"
+        }
+        description {
+	    label {[_ glossar.glossar_description]}
+        }
+        source_category {
+	    label {[_ glossar.glossar_source_category_header]}
+	}
+        target_category {
+	    label {[_ glossar.glossar_target_category]}
+        }
+	glossar_edit {
+	    display_template "<a href=\"@gl_glossar_portlet.edit_url@\">[_ acs-kernel.common_Edit]</a>"
+	}	
+	glossar_files {
+	    display_template "<a href=\"@gl_glossar_portlet.files_url@\">[_ glossar.Files]</a>"
+	}	
+
+    } -actions $actions -sub_class narrow \
+    -filters {
+	customer_id {}
+	edit_link {}
+    } \
+    -formats {
+	normal {
+	    label "[_ glossar.Table]"
+	    layout table
+	    elements $row_list 
+	}
+	csv {
+	    label "[_ glossar.CSV]"
+	    output csv
+	    page_size 0
+	    row 
+	}
+    } 
+
+
+set static_customer_id $customer_id
+
+db_multirow -extend {source_category target_category gl_translation_p glossar_edit glossar_files files_url edit_url title_url new_glossar} gl_glossar_portlet gl_glossar_portlet  {} {
+    if {![empty_string_p $target_category_id]} {
+	set gl_translation_p 1
+    } else {
+	set gl_translation_p 0
+    }
+    set glossar_edit "[_ glossar.glossar_Edit]"
+    set glossar_files "[_ glossar.files]"
+    set source_category "[category::get_name $source_category_id]"
+    set target_category "[category::get_name $target_category_id]"
+    set title_url "[export_vars -base "${base_url}/glossar-term-list" {glossar_id gl_translation_p customer_id owner_id}]"
+    set edit_url "[export_vars -base "${base_url}/glossar-add" {owner_id glossar_id gl_translation_p }]"
+    set files_url "[export_vars -base "${base_url}/glossar-file-upload" {glossar_id}]"
+    if {$customer_id == $owner_id} {
+	set new_glossar "[export_vars -base "${base_url}/index" {owner_id}]"
+    } else {
+	set new_glossar "[export_vars -base "${base_url}/index" {owner_id customer_id}]"
+    }
+} if_no_rows {
+
+
+}
+
+}
\ No newline at end of file
Index: openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.xql	23 Aug 2005 19:39:16 -0000	1.1
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE queryset PUBLIC "-//OpenACS//DTD XQL 1.0//EN" "http://www.thecodemill.biz/repository/xql.dtd">
+<!-- packages/glossar/lib/glossar-portlet-list.xql -->
+<!-- @author Bjoern Kiesbye (bjoern_kiesbye@web.de) -->
+<!-- @creation-date 2005-07-29 -->
+<!-- @arch-tag: 51409eb9-601b-412e-a3f3-fe4b419c9ff1 -->
+<!-- @cvs-id $Id: glossar-portlet-list.xql,v 1.1 2005/08/23 19:39:16 miguelm Exp $ -->
+
+<queryset>
+  <fullquery name="gl_glossar_portlet">
+    <querytext>  
+
+      SELECT cr.item_id as glossar_id , crr.title , crr.description , gl.source_category_id , gl.target_category_id , gl.owner_id, org.name , 1 as query_number ,
+case when gl.target_category_id is null then 0 else 1 end as sort_key  
+      FROM gl_glossars gl, cr_items cr, cr_revisions crr , organizations org  
+      WHERE cr.latest_revision = crr.revision_id 
+      AND crr.revision_id = gl.glossar_id	
+      AND gl.owner_id = org.organization_id
+      AND org.organization_id = :customer_id 
+      UNION
+      SELECT cr.item_id as glossar_id , crr.title , crr.description , gl.source_category_id , gl.target_category_id , gl.owner_id, org.name , 2 as query_number ,
+case when gl.target_category_id is null then 0 else 1 end as sort_key  
+      FROM gl_glossars gl, cr_items cr, cr_revisions crr, organizations org    
+      WHERE cr.latest_revision = crr.revision_id 
+      AND crr.revision_id = gl.glossar_id	
+      AND gl.owner_id =  org.organization_id
+      AND org.organization_id IN ('$where_etat_ids')
+      ORDER BY query_number asc , 
+    </querytext>
+</fullquery>
+</queryset>
\ No newline at end of file