Index: openacs-4/packages/courses/courses.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/courses.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/courses.info	2 Feb 2005 17:11:30 -0000	1.2
+++ openacs-4/packages/courses/courses.info	2 Feb 2005 23:01:00 -0000	1.3
@@ -8,12 +8,13 @@
     <singleton-p>t</singleton-p>
     <auto-mount>courses</auto-mount>
 
-    <version name="0.1d" url="http://openacs.org/repository/download/apm/courses-0.1d.apm">
+    <version name="1.0d" url="http://openacs.org/repository/download/apm/courses-1.0d.apm">
         <owner url="mailto:miguelmarin@viaro.net">Miguel Marin</owner>
+        <release-date>2005-02-02</release-date>
         <vendor url="http://www.viaro.net">Viaro Networks</vendor>
         <maturity>0</maturity>
 
-        <provides url="courses" version="0.1d"/>
+        <provides url="courses" version="1.0d"/>
         <requires url="acs-content-repository" version="5.2.0d8"/>
         <requires url="acs-subsite" version="5.2.0d2"/>
         <requires url="assessment" version="0.10d5"/>
Index: openacs-4/packages/courses/catalog/courses.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/catalog/courses.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/catalog/courses.en_US.ISO-8859-1.xml	2 Feb 2005 17:14:29 -0000	1.2
+++ openacs-4/packages/courses/catalog/courses.en_US.ISO-8859-1.xml	2 Feb 2005 23:01:00 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="courses" package_version="0.1d" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="courses" package_version="1.0d" locale="en_US" charset="ISO-8859-1">
 
   <msg key="add_course">Add Course</msg>
   <msg key="asm">Assessment</msg>
@@ -36,6 +36,10 @@
   <msg key="revisions">Revisions</msg>
   <msg key="revoke">Revoke</msg>
   <msg key="revoke_per">Revoke Permissions</msg>
+  <msg key="search_help">use only lower case and search for one first name or last name.</msg>
+  <msg key="search_u">Search Users</msg>
+  <msg key="search_user">Search User Name:</msg>
+  <msg key="search_user_email">Search for user Email:</msg>
   <msg key="see_all_rev">See All Revisions</msg>
   <msg key="subject_name">Subject Name</msg>
   <msg key="term_name">Term Name</msg>
Index: openacs-4/packages/courses/tcl/course-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/tcl/course-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/tcl/course-procs.tcl	2 Feb 2005 17:19:54 -0000	1.1
+++ openacs-4/packages/courses/tcl/course-procs.tcl	2 Feb 2005 23:01:00 -0000	1.2
@@ -15,14 +15,15 @@
 
 ad_proc -private course_catalog::get_item_id { 
     -name:required
-    -parent_id:required
-    -content_type:required
-} {
-    Returns the item_id in the CR with the name @name@ under folder_id @folder_id@
+    {-parent_id ""}
+ } {
+    Returns the item_id in the CR with the name @name@ under folder course_catalog
     @name@         The name of the item id in the CR
     @parent_id@    The folder_id where the item is stored
-    @content_type@ The content_type of the item
 } {
+    if { [string equal $parent_id ""] } {
+	set parent_id [course_catalog::get_folder_id]
+    }
 
     return [db_string get_item_from_name { } ]
 }
@@ -119,10 +120,10 @@
     -course_id:required
 } {
     Deletes the relation of course_catalog and dotrln class
-    @object_id The id of the object_id_one
+    @course_id The id of the object_id_one
 } {
     set rel_id [course_catalog::has_relation_rel_id -course_id $course_id]
     if { ![string equal $rel_id "0"] } {
 	db_exec_plsql remove_relation { }
     }
-}
+}
\ No newline at end of file
Index: openacs-4/packages/courses/tcl/course-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/tcl/course-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/tcl/course-procs.xql	2 Feb 2005 17:19:54 -0000	1.1
+++ openacs-4/packages/courses/tcl/course-procs.xql	2 Feb 2005 23:01:00 -0000	1.2
@@ -11,7 +11,7 @@
 <fullquery name="course_catalog::get_item_id.get_item_from_name">
   <querytext>
         select item_id from cr_items
-        where name = :name and parent_id = :parent_id and content_type = :content_type
+        where name = :name and parent_id = :parent_id and content_type = 'course_catalog'
   </querytext>
 </fullquery>
 
Index: openacs-4/packages/courses/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/www/index.adp	2 Feb 2005 17:22:32 -0000	1.1
+++ openacs-4/packages/courses/www/index.adp	2 Feb 2005 23:01:00 -0000	1.2
@@ -8,5 +8,6 @@
 <ul>
     <li><a href="cc-admin/add-edit-course?return_url=@return_url@">#courses.add_course#</a>
     <li><a href="cc-admin/course-list?return_url=@return_url@">#courses.course_list#</a>
+    <li><a href="cc-admin/grant-list?return_url=@return_url@">#courses.grant_per#</a>
 </ul>
 </if>
Index: openacs-4/packages/courses/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/www/index.tcl	2 Feb 2005 17:22:32 -0000	1.1
+++ openacs-4/packages/courses/www/index.tcl	2 Feb 2005 23:01:00 -0000	1.2
@@ -9,6 +9,7 @@
 set page_title "[_ courses.course_catalog]"
 set context ""
 set return_url "/courses/cc-admin/course-list"
+
 set cc_package_id [apm_package_id_from_key "courses"]
 
 set user_id [auth::get_user_id]
Index: openacs-4/packages/courses/www/cc-admin/add-edit-course.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/Attic/add-edit-course.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/www/cc-admin/add-edit-course.tcl	2 Feb 2005 17:26:55 -0000	1.1
+++ openacs-4/packages/courses/www/cc-admin/add-edit-course.tcl	2 Feb 2005 23:01:00 -0000	1.2
@@ -6,34 +6,35 @@
 
 } {
     course_id:optional
+    mode:optional
     { return_url "" }
 }
 
 if { [string equal $return_url ""]} {
     set return_url "/courses/cc-admin"
 }
 
-# To disable the element course_key
-if { [info exists course_id] } {
-    set mode display
-} else {
-    set mode edit
-}
-
 set user_id [auth::get_user_id]
 set page_title ""
 set context ""
 
-# Check if users has admin permission to edit course_catalog
-if { [info exists course_id] } {
+if { [info exists mode] } {
+    # Check if users has admin permission to edit course_catalog
     permission::require_permission -party_id $user_id -object_id $course_id -privilege "admin"
+    # To disable the element course_key
+    set mode display
+} else {
+    set mode edit
 }
 
+
 # Get assessments
 set asm_package_id [apm_package_id_from_key assessment]
 set asm_list [list [list "[_ courses.not_associate]" "-1"]]
 db_foreach  assessment {} {
-    lappend asm_list [list $title $assessment_id]
+    if { [permission::permission_p -party_id $user_id -object_id $assessment_id -privilege "admin"] == 1 } {
+	lappend asm_list [list $title $assessment_id] 
+    }
 }
 
 # Get a list of all the attributes asociated to course_catalog
@@ -106,13 +107,13 @@
     # Set the new revision live
     course_catalog::set_live -name $course_key -revision_id $course_id
     # Grant admin privileges to the user over the item in the CR
-    permission::grant -party_id $user_id -object_id $course_id  -privilege "admin"
+    permission::grant -party_id $user_id -object_id $item_id  -privilege "admin"
 
 } -edit_data {
     
     # New revision in the CR
     set folder_id [course_catalog::get_folder_id]
-    set item_id [course_catalog::get_item_id -name $course_key -parent_id $folder_id -content_type "course_catalog"]
+    set item_id [course_catalog::get_item_id -name $course_key -parent_id $folder_id]
     set course_id [content::revision::new -item_id $item_id -title $course_key \
 		       -description "$course_name: $course_info"]
     
@@ -123,7 +124,7 @@
     # Set the new revision live
     course_catalog::set_live -name $course_key -revision_id $course_id
     # Grant admin privileges to the user over the item in the CR
-    permission::grant -party_id $user_id -object_id $course_id  -privilege "admin"
+    # permission::grant -party_id $user_id -object_id $course_id  -privilege "admin"
 
 } -new_request {
     set context [list "[_ courses.add_course]"]
Index: openacs-4/packages/courses/www/cc-admin/course-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/course-list.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/www/cc-admin/course-list.tcl	2 Feb 2005 17:26:55 -0000	1.1
+++ openacs-4/packages/courses/www/cc-admin/course-list.tcl	2 Feb 2005 23:01:00 -0000	1.2
@@ -38,7 +38,7 @@
 	key {
 	    label "[_ courses.course_key]"
 	    display_template {
-		<a href=add-edit-course?course_id=@course_list.course_id@&return_url=$return_url \
+		<a href=add-edit-course?course_id=@course_list.course_id@&return_url=$return_url&mode=edit \
 		    title="[_ courses.new_ver]">\
 		    <img border=0 src=/resources/Edit16.gif></a>
 		<a href="revision-list?course_key=@course_list.course_key@&return_url=$return_url&course_id=@course_list.course_id@" title="[_ courses.see_all_rev]">@course_list.course_key@</a>
Index: openacs-4/packages/courses/www/cc-admin/course-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/course-list.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/www/cc-admin/course-list.xql	2 Feb 2005 17:26:55 -0000	1.1
+++ openacs-4/packages/courses/www/cc-admin/course-list.xql	2 Feb 2005 23:01:00 -0000	1.2
@@ -3,10 +3,10 @@
 
 <fullquery name="get_course_info">      
       <querytext>
-            select course_id, course_key, course_name, course_info, assessment_id 
+            select course_id, course_key, course_name, course_info, assessment_id, item_id
 	    from course_catalog, cr_items
 	    where course_id = live_revision and  
-	    course_id in (
+	    item_id in (
 		select object_id from acs_permissions where grantee_id = :user_id and
 		privilege = 'admin')
          	
Index: openacs-4/packages/courses/www/cc-admin/revision-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/revision-list.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/www/cc-admin/revision-list.tcl	2 Feb 2005 17:26:55 -0000	1.1
+++ openacs-4/packages/courses/www/cc-admin/revision-list.tcl	2 Feb 2005 23:01:00 -0000	1.2
@@ -24,10 +24,11 @@
 
 set asm_package_id [apm_package_id_from_key assessment]
 
-db_multirow -extend { asm_name class_name} course_list get_course_info {} {
+db_multirow -extend { asm_name class_name delete_p } course_list get_course_info {} {
     set asm_name [db_string get_asm_name { } -default "[_ courses.not_associated]"]
     set class_id [course_catalog::has_relation -course_id $course_id]
     set class_name [db_string get_class_info { } -default "[_ courses.not_associated]"]
+    set delete_p [course_catalog::check_live_latest -revision_id $course_id]
 }
 
 template::list::create \
@@ -42,7 +43,9 @@
 	key {
 	    label "[_ courses.course_key]"
 	    display_template {
-	      <a href="delete-revision?revision_id=@course_list.course_id@&course_key=@course_list.course_key@"><img border=0 src="/resources/Delete16.gif"></a>
+	      <if @course_list.delete_p@ eq 1>
+ 	         <a href="delete-revision?revision_id=@course_list.course_id@&course_key=@course_list.course_key@"><img border=0 src="/resources/Delete16.gif"></a>
+		</if><else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</else>
 	      @course_list.course_key@
 	    }
 	}