Index: openacs-4/packages/glossar/glossar.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/glossar.info,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/glossar/glossar.info 17 Oct 2005 16:28:21 -0000 1.3
+++ openacs-4/packages/glossar/glossar.info 2 Nov 2005 15:12:39 -0000 1.4
@@ -7,7 +7,7 @@
f
t
-
+
Bjoern Kiesbye
Malte Sussdorff
Glossars , translations for specific terms, and terms that shouldn't be used.
@@ -16,7 +16,7 @@
Glossars , translations for specific terms, and terms that shouldn't be used.
0
-
+
Index: openacs-4/packages/glossar/lib/glossar-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/lib/glossar-list.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/glossar/lib/glossar-list.tcl 21 Oct 2005 14:28:33 -0000 1.4
+++ openacs-4/packages/glossar/lib/glossar-list.tcl 2 Nov 2005 15:12:40 -0000 1.5
@@ -142,6 +142,7 @@
}
} -actions $actions -sub_class narrow \
+ -bulk_actions {"Move Glossars" "glossar-move" "Moves glossars to another customer"} \
-orderby {
default_value title
glossar_id {
Index: openacs-4/packages/glossar/sql/postgresql/glossar-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/sql/postgresql/glossar-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossar/sql/postgresql/glossar-create.sql 20 Aug 2005 09:37:51 -0000 1.1
+++ openacs-4/packages/glossar/sql/postgresql/glossar-create.sql 2 Nov 2005 15:12:40 -0000 1.2
@@ -17,7 +17,8 @@
glossar_id integer primary key references acs_objects(object_id),
owner_id integer not null references acs_objects(object_id),
source_category_id integer not null references categories(category_id),
- target_category_id integer default null references categories(category_id)
+ target_category_id integer default null references categories(category_id),
+ etat_id integer default null references acs_objects(object_id)
);
Index: openacs-4/packages/glossar/tcl/glossar-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/tcl/glossar-install-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossar/tcl/glossar-install-procs.tcl 17 Oct 2005 16:26:53 -0000 1.2
+++ openacs-4/packages/glossar/tcl/glossar-install-procs.tcl 2 Nov 2005 15:12:40 -0000 1.3
@@ -25,6 +25,7 @@
content::type::attribute::new -content_type {gl_glossar} -attribute_name {owner_id} -datatype {number} -pretty_name {[_ glossar.glossar_owner]} -column_spec {interger}
content::type::attribute::new -content_type {gl_glossar} -attribute_name {source_category_id} -datatype {number} -pretty_name {[_ glossar.glossar_source_category]} -column_spec {interger}
content::type::attribute::new -content_type {gl_glossar} -attribute_name {target_category_id} -datatype {number} -pretty_name {[_ glossar.glossar_target_category]} -column_spec {interger}
+ content::type::attribute::new -content_type {gl_glossar} -attribute_name {etat_id} -datatype {number} -pretty_name {[_ glossar.glossar_etat]} -column_spec {integer}
# Glossar Term Attribs.
@@ -45,7 +46,12 @@
# register the allowed content types for a folder
content::folder::register_content_type -folder_id $folder_id -content_type {gl_glossar} -include_subtypes t
content::folder::register_content_type -folder_id $folder_id -content_type {gl_glossar_term} -include_subtypes t
+
+ # Create the default objects to map the category trees using the admin UI
+ package_instantiate_object -package_name acs_object -var_list [list [list new__context_id $package_id] [list new__package_id $package_id] [list new__title "#glossar.from_default_object_id#"]] acs_object
+ package_instantiate_object -package_name acs_object -var_list [list [list new__context_id $package_id] [list new__package_id $package_id] [list new__title "#glossar.to_default_object_id#"]] acs_object
+
}
@@ -63,10 +69,13 @@
# Create the default objects to map the category trees using the admin UI
set package_id [ad_conn package_id]
- package_instantiate_object -package_name acs_object -var_list [list [list new__context_id $package_id] [list new__package_id $package_id] [list new__title "#glossar.from_default_object_id#"]] acs_object]
+ package_instantiate_object -package_name acs_object -var_list [list [list new__context_id $package_id] [list new__package_id $package_id] [list new__title "#glossar.from_default_object_id#"]] acs_object
- package_instantiate_object -package_name acs_object -var_list [list [list new__context_id $package_id] [list new__package_id $package_id] [list new__title "#glossar.to_default_object_id#"]] acs_object]
+ package_instantiate_object -package_name acs_object -var_list [list [list new__context_id $package_id] [list new__package_id $package_id] [list new__title "#glossar.to_default_object_id#"]] acs_object
}
+ 0.3d2 0.3d3 {
+ content::type::attribute::new -content_type {gl_glossar} -attribute_name {etat_id} -datatype {number} -pretty_name {[_ glossar.glossar_etat]} -column_spec {integer}
+ }
}
}
\ No newline at end of file
Index: openacs-4/packages/glossar/tcl/glossar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/tcl/glossar-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossar/tcl/glossar-procs.tcl 20 Aug 2005 09:37:51 -0000 1.1
+++ openacs-4/packages/glossar/tcl/glossar-procs.tcl 2 Nov 2005 15:12:40 -0000 1.2
@@ -22,8 +22,8 @@
{-title ""}
{-description ""}
{-target_category_id [db_null]}
+ {-etat_id ""}
-
} {
@author Bjoern Kiesbye (bjoern_kiesbye@web.de)
@creation-date 2005-07-13
@@ -51,6 +51,7 @@
[list owner_id $owner_id] \
[list source_category_id $source_category_id] \
[list target_category_id $target_category_id] \
+ [list etat_id $etat_id] \
] ]
}
@@ -63,6 +64,7 @@
-owner_id:required
-source_category_id:required
-target_category_id:required
+ -etat_id:required
{-title ""}
{-name ""}
{-description ""}
@@ -82,6 +84,7 @@
[list owner_id $owner_id] \
[list source_category_id $source_category_id] \
[list target_category_id $target_category_id] \
+ [list etat_id $etat_id] \
] ]
}
Index: openacs-4/packages/glossar/www/glossar-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/www/glossar-add.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossar/www/glossar-add.tcl 17 Oct 2005 16:23:01 -0000 1.2
+++ openacs-4/packages/glossar/www/glossar-add.tcl 2 Nov 2005 15:12:40 -0000 1.3
@@ -38,7 +38,6 @@
acs_object::get -object_id $owner_id -array owner
set package_id $owner(package_id)
-
set from_object_id [db_string get_from_default_object { }]
set to_object_id [db_string get_to_default_object { }]
@@ -76,6 +75,10 @@
}
}
+ad_form -extend -name glossar-add -form {
+ {etat_id:number(select),optional {label "[_ glossar.glossar_etat]"}
+ {options [db_list_of_lists get_etats "select name, organization_id from organizations where organization_id in (select case when object_id_one = :owner_id then object_id_two else object_id_one end as organization_id from acs_rels ar, acs_rel_types art where ar.rel_type = art.rel_type and (object_id_one = :owner_id or object_id_two = :owner_id) and ar.rel_type = 'contact_rels_etat'"]}}
+}
@@ -84,6 +87,7 @@
-new_request {
set source_category_id ""
set target_category_id ""
+ set etat_id ""
set description ""
set title ""
} -edit_request {
@@ -96,11 +100,11 @@
set target_category_id [db_null]
}
- gl_glossar::new -owner_id $owner_id -title "$title" -description "$description" -source_category_id $source_category_id -target_category_id $target_category_id -package_id $package_id
+ gl_glossar::new -owner_id $owner_id -title "$title" -description "$description" -source_category_id $source_category_id -target_category_id $target_category_id -package_id $package_id -etat_id $etat_id
} -edit_data {
- gl_glossar::edit -glossar_item_id $glossar_id -title "$title" -description "$description" -source_category_id $source_category_id -target_category_id $target_category_id -owner_id $owner_id
+ gl_glossar::edit -glossar_item_id $glossar_id -title "$title" -description "$description" -source_category_id $source_category_id -target_category_id $target_category_id -owner_id $owner_id -etat_id $etat_id
} -after_submit {
ad_returnredirect [export_vars -base index {gl_translation_p glossar_id customer_id owner_id}]
Index: openacs-4/packages/glossar/www/glossar-add.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/www/glossar-add.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossar/www/glossar-add.xql 17 Oct 2005 16:23:01 -0000 1.1
+++ openacs-4/packages/glossar/www/glossar-add.xql 2 Nov 2005 15:12:40 -0000 1.2
@@ -9,6 +9,7 @@
gl.source_category_id,
gl.target_category_id,
gl.owner_id
+ gl.etat_id
from
gl_glossars gl,
cr_items cr,
Index: openacs-4/packages/glossar/www/glossar-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/www/glossar-edit.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossar/www/glossar-edit.tcl 20 Aug 2005 09:37:51 -0000 1.1
+++ openacs-4/packages/glossar/www/glossar-edit.tcl 2 Nov 2005 15:12:40 -0000 1.2
@@ -18,7 +18,7 @@
}
-db_1row get_glossar "SELECT title as old_title, comment as old_comment , source_category_id , target_category_id , owner_id FROM gl_glossars WHERE glossar_id = :glossar_id"
+db_1row get_glossar "SELECT title as old_title, comment as old_comment , source_category_id , target_category_id , etat_id , owner_id FROM gl_glossars WHERE glossar_id = :glossar_id"
@@ -32,11 +32,12 @@
{source_category_id:text(hidden) {value "$source_category_id"}}
{target_category_id:text(hidden) {value "$target_category_id"}}
+ {etat_id:number(select),optional {label "[_ glossar.glossar_etat]"} {options [db_list_of_lists get_etats "select name, organization_id from organizations where organization_id in (select case when object_id_one = :owner_id then object_id_two else object_id_one end as organization_id from acs_rels ar, acs_rel_types art where ar.rel_type = art.rel_type and (object_id_one = :owner_id or object_id_two = :owner_id) and ar.rel_type = 'contact_rels_etat'"]}}
{owner_id:key}
} -edit_data {
- gl_glossar::edit -glossar_id $glossar_id -title "$title" -comment "$comment" -source_category_id $source_category_id -target_category_id $target_category_id -owner_id $owner_id
+ gl_glossar::edit -glossar_id $glossar_id -title "$title" -comment "$comment" -source_category_id $source_category_id -target_category_id $target_category_id -owner_id $owner_id -etat_id $etat_id
} -edit_request {}
Index: openacs-4/packages/glossar/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/www/index.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossar/www/index.tcl 17 Oct 2005 16:25:23 -0000 1.2
+++ openacs-4/packages/glossar/www/index.tcl 2 Nov 2005 15:12:40 -0000 1.3
@@ -17,6 +17,13 @@
set owner_id [ad_conn user_id]
+# If we do not have a customer, set the customer to the user
+# this way it will be a "personal" glossar.
+
+if {[empty_string_p $customer_id]} {
+ set customer_id $owner_id
+}
+
set package_id [ad_conn package_id]
set admin_p [permission::permission_p -object_id $package_id -party_id $owner_id -privilege "admin"]