"});
-_ac.on("render",function(){
+var _be=acs_lang_text.upload_intro||"Click Browse to select a file to upload to the selected folder on the tree.";
+var _ba=false;
+var _bb="Upload Files";
+var _bc=new Ext.Panel({id:"form_multi_addfile",autoScroll:true,frame:true,html:"
"+_be+"
"});
+_bc.on("render",function(){
this.swfu.addSetting("progress_target","fsuploadprogress");
},this);
-var _ad=[{text:"Browse",handler:this.swfu.browse.createDelegate(this.swfu),icon:"/resources/ajaxhelper/icons/page_add.png",cls:"x-btn-text-icon"},{text:"Upload",handler:this.swfu.startUpload.createDelegate(this.swfu,[null,this],false),icon:"/resources/ajaxhelper/icons/arrow_up.png",cls:"x-btn-text-icon"},{text:"Hide",handler:function(){
+var _bd=[{text:"Browse",handler:this.swfu.browse.createDelegate(this.swfu),icon:"/resources/ajaxhelper/icons/page_add.png",cls:"x-btn-text-icon"},{text:"Upload",handler:this.swfu.startUpload.createDelegate(this.swfu,[null,this],false),icon:"/resources/ajaxhelper/icons/arrow_up.png",cls:"x-btn-text-icon"},{text:"Hide",handler:function(){
this.upldWindow.hide();
}.createDelegate(this),icon:"/resources/ajaxhelper/icons/cross.png",cls:"x-btn-text-icon"}];
}
-this.upldWindow=new Ext.Window({id:"upload-win",layout:"fit",width:400,height:300,title:_ab,closeAction:"hide",modal:_aa,plain:true,resizable:false,items:_ac,buttons:_ad});
+this.upldWindow=new Ext.Window({id:"upload-win",layout:"fit",width:400,height:300,title:_bb,closeAction:"hide",modal:_ba,plain:true,resizable:false,items:_bc,buttons:_bd});
}
this.upldWindow.show();
},uploadOneFile:function(){
if(Ext.get("upload_file").getValue()!=""&&Ext.get("filetitle").getValue()!=""){
-var _af=this.layout.findById("treepanel");
-var _b0={success:function(){
+var _bf=this.layout.findById("treepanel");
+var _c0={success:function(){
},upload:function(){
-_af.getSelectionModel().getSelectedNode().loaded=false;
-_af.getSelectionModel().getSelectedNode().fireEvent("click",_af.getSelectionModel().getSelectedNode());
+_bf.getSelectionModel().getSelectedNode().loaded=false;
+_bf.getSelectionModel().getSelectedNode().fireEvent("click",_bf.getSelectionModel().getSelectedNode());
this.upldWindow.body.unmask();
this.upldWindow.hide();
},failure:function(){
Ext.Msg.alert(acs_lang_text.error||"Error",acs_lang_text.upload_failed||"Upload failed, please try again later.");
},scope:this};
-var _b1=acs_lang_text.loading||"One moment. This may take a while depending on how large your upload is.";
-this.upldWindow.body.mask(" "+_b1);
+var _c1=acs_lang_text.loading||"One moment. This may take a while depending on how large your upload is.";
+this.upldWindow.body.mask(" "+_c1);
YAHOO.util.Connect.setForm("newfileform",true,true);
-var _b2=YAHOO.util.Connect.asyncRequest("POST",this.xmlhttpurl+"add-file",_b0);
+var _c2=YAHOO.util.Connect.asyncRequest("POST",this.xmlhttpurl+"add-file",_c0);
}else{
Ext.Msg.alert(acs_lang_text.alert||"Alert",acs_lang_text.file_required||"Title and File to upload are required.");
}
},addUrl:function(){
if(this.createurlWindow==null){
this.createurlWindow=new Ext.Window({id:"createurl-win",layout:"fit",width:400,height:180,title:"Create URL",closeAction:"hide",modal:true,plain:true,resizable:false,items:new Ext.FormPanel({id:"form_create_url",align:"left",autoScroll:true,closable:true,layout:"form",defaults:{width:230},frame:true,buttonAlign:"left",items:[{xtype:"textfield",fieldLabel:"Title",allowBlank:false,name:"fstitle",tabIndex:1},{xtype:"textfield",fieldLabel:"URL",allowBlank:false,name:"fsurl",tabIndex:2},{xtype:"textfield",fieldLabel:"Description",name:"fsdescription",tabIndex:3}]}),buttons:[{text:"Submit",handler:function(){
-this.createurlWindow.findById("form_create_url").getForm().submit({url:this.xmlhttpurl+"add-url",waitMsg:"One moment ....",params:{package_id:this.config.package_id,folder_id:this.currentfolder},reset:true,scope:this,success:function(_b3,_b4){
-if(_b4.result){
+this.createurlWindow.findById("form_create_url").getForm().submit({url:this.xmlhttpurl+"add-url",waitMsg:"One moment ....",params:{package_id:this.config.package_id,folder_id:this.currentfolder},reset:true,scope:this,success:function(_c3,_c4){
+if(_c4.result){
this.createurlWindow.hide();
}else{
-Ext.MessageBox.alert("Error","Sorry an error occured. "+_b4.result.error);
+Ext.MessageBox.alert("Error","Sorry an error occured. "+_c4.result.error);
}
-},failure:function(_b5,_b6){
-if(_b6.result){
-Ext.MessageBox.alert("Error",_b6.result.error);
+},failure:function(_c5,_c6){
+if(_c6.result){
+Ext.MessageBox.alert("Error",_c6.result.error);
}
}});
}.createDelegate(this),icon:"/resources/ajaxhelper/icons/disk.png",cls:"x-btn-text-icon"},{text:"Close",handler:function(){
this.createurlWindow.hide();
}.createDelegate(this),icon:"/resources/ajaxhelper/icons/cross.png",cls:"x-btn-text-icon"}]});
}
this.createurlWindow.show();
-},renameItem:function(_b7,i,e){
-var _ba=_b7;
-var _bb=this.layout.findById("treepanel");
-var _bc=_ba.store.getAt(i);
-var _bd=_bc.get("url");
-var _be=_bc.get("type");
-var _bf=_bc.get("id");
-var _c0=_bc.get("filename");
-var _c1=function(_c2){
-var _c3=acs_lang_text.an_error_occurred||"An error occurred";
-var _c4=acs_lang_text.reverted||"Your changes have been reverted";
-var _c5=Ext.decode(_c2.responseText);
-if(!_c5.success){
-Ext.Msg.alert(acs_lang_text.error||"Error",_c3+":
Select the community where you wish to share the "+foldertitle+" folder with.
"
+ });
+
+ var shareBtns = [{
+ text: 'Ok',
+ icon:"/resources/ajaxhelper/icons/disk.png",
+ cls:"x-btn-text-icon",
+ handler:sharefolder.createDelegate(this)
+ },{
+ text: 'Cancel',
+ icon:"/resources/ajaxhelper/icons/cross.png",
+ cls:"x-btn-text-icon",
+ handler: function(){
+ shareWindow.hide();
+ }.createDelegate(this)
+ }];
+
+ shareWindow = new Ext.Window({
+ id:'share-win',
+ layout:'fit',
+ width:380,
+ height:200,
+ title:"Share Folder",
+ closeAction:'hide',
+ modal:true,
+ plain:true,
+ autoScroll:false,
+ resizable:false,
+ items: shareFormBody,
+ buttons: shareBtns
+ });
+
+ shareWindow.on("show",function() {
+
+ if(this.communityCombo == null) {
+
+ var communities = new Ext.data.JsonStore({
+ url: xmlhttpurl+'list-communities',
+ root: 'communities',
+ fields: ['target_folder_id', 'instance_name']
+ });
+
+ this.communityCombo = new Ext.form.ComboBox({
+ store: communities,
+ displayField:'instance_name',
+ typeAhead: true,
+ triggerAction: 'all',
+ emptyText:'Select a community',
+ hiddenName:'target_folder_id',
+ valueField:'target_folder_id',
+ forceSelection:true,
+ handleHeight: 80,
+ selectOnFocus:true,
+ applyTo:'communities_list'
+ });
+
+ }
+
+ },this);
+
+ } else {
+
+ this.communityCombo.reset();
+
+ }
+
+ shareWindow.show();
+
+ },
+
// redirect to object views for a file
redirectViews : function(grid,i,e) {
var filepanel = grid;
@@ -1397,7 +1697,7 @@
} else if (nodetype === "url") {
var copytext = node.get("url");
} else {
- var copytext = window.location.protocol+"//"+window.location.hostname+node.get("url");
+ var copytext = window.location.protocol+"//"+window.location.hostname+node.get("linkurl");
}
if(Ext.isIE) {
window.clipboardData.setData("text",copytext);
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/delete-fsitem.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/delete-fsitem.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/delete-fsitem.tcl 26 Nov 2007 12:52:45 -0000 1.1
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/delete-fsitem.tcl 13 Dec 2007 05:33:42 -0000 1.2
@@ -28,10 +28,21 @@
if { [permission::permission_p -party_id $viewing_user_id -object_id $fs_object_id -privilege "delete"] } {
if { [fs::folder_p -object_id $fs_object_id] } {
fs::delete_folder -folder_id $fs_object_id -parent_id [fs::get_parent -item_id $fs_object_id]
+ # db_exec_plsql folder_delete "select file_storage__delete_folder(:fs_object_id,'t');"
# ns_log notice "HAM : delete folder *******"
} else {
- fs::delete_file -item_id $fs_object_id
+ # fs::delete_file -item_id $fs_object_id
# ns_log notice "HAM : delete file *******"
+ # if { [content::symlink::is_symlink -item_id $fs_object_id] == "t" } {
+ fs::delete_file -item_id $fs_object_id
+ # db_exec_plsql file_delete "select file_storage__delete_file(:fs_object_id);"
+ # } else {
+ # HAM : we want admins to be able to request undeleting a file
+ # to prevent name clashes, we need to prepend the name with "deleted_"
+ # before we unpublish the item
+ # db_dml "update_name" "update cr_items set name='deleted_$fs_object_id', deleted_p='t' where item_id = :fs_object_id"
+ # item::unpublish -item_id $fs_object_id
+ #}
}
} else {
set errmsg "You do not have permission to delete this file."
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.adp 26 Nov 2007 12:52:45 -0000 1.1
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.adp 13 Dec 2007 05:33:42 -0000 1.2
@@ -1,5 +1,4 @@
{ "total": @counter@, "foldercontents":[
-{"id":"@contents.object_id@","icon":"@contents.icon;noquote@","type":"@contents.type;noquote@",tags:"@contents.tags;noquote@","title":"@contents.title;noquote@","filename":"@contents.filename;noquote@","url":"@contents.download_url;noquote@","size":"@contents.content_size_pretty@","lastmodified":"@contents.last_modified_pretty@","write_p":@contents.write_p@}
-
+{"id":"@contents.object_id@","icon":"@contents.icon;noquote@","type":"@contents.type;noquote@","tags":"@contents.tags;noquote@","title":"@contents.title;noquote@","filename":"@contents.filename;noquote@","url":"@contents.download_url;noquote@","size":"@contents.content_size_pretty@","lastmodified":"@contents.last_modified_pretty@","write_p":@contents.write_p@,"linkurl":"@contents.linkurl;noquote@","symlink_id":"@contents.symlink_id@"}
]}
\ No newline at end of file
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.tcl 26 Nov 2007 12:52:45 -0000 1.1
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.tcl 13 Dec 2007 05:33:42 -0000 1.2
@@ -10,6 +10,7 @@
folder_id:optional
tag_id:integer,optional
{sort "fs_objects.title"}
+ {package_id:optional}
{dir "DESC"}
}
@@ -23,6 +24,7 @@
# so that we can get a path to prefix to the files
set root_package_id [ajaxfs::get_root_folder -folder_id $folder_id]
+if {[info exists package_id]} { set root_package_id $package_id }
set root_folder_id [fs::get_root_folder -package_id $root_package_id]
set folder_name [lang::util::localize [fs::get_object_name -object_id $folder_id]]
@@ -86,8 +88,10 @@
}
-db_multirow -extend { filename icon last_modified_pretty content_size_pretty download_url object_counter file_list_start file_list_end write_p tags} contents $query_name $query {
+db_multirow -extend { filename icon last_modified_pretty content_size_pretty download_url linkurl object_counter file_list_start file_list_end write_p tags symlink_id} contents $query_name $query {
+ set symlink_id ""
+
# title of the file
if { ![exists_and_not_null title] } { set title $name }
@@ -117,8 +121,40 @@
switch -- $type {
folder {
- set icon ""
+ set shared_with [db_list get_share_from "select p.instance_name
+ from cr_folders f,
+ cr_symlinks s,
+ cr_items i,
+ acs_objects o,
+ apm_packages p,
+ site_nodes s1,
+ site_nodes s2
+ where o.package_id = s2.object_id
+ and s1.node_id = s2.parent_id
+ and s1.object_id = p.package_id
+ and s.symlink_id = o.object_id
+ and s.symlink_id = i.item_id
+ and s.target_id = :object_id
+ and f.folder_id=i.parent_id"]
+ if { [llength $shared_with] > 0} {
+ set shareditems [join ${shared_with} "
"]
+ set qtip "
${title} is shared with
${shareditems}
"
+ set icon ""
+ } else {
+ set qtip "${title}"
+ set icon ""
+ }
}
+ symlink {
+ set target_id [db_string get_target_folder "select target_id from cr_symlinks where symlink_id=:object_id"]
+ set symlink_id $object_id
+ set object_id $target_id
+ set target_package_id [ajaxfs::get_root_folder -folder_id $target_id]
+ set instance_name [db_string get_subsite_name "select instance_name from apm_packages where package_id=(select context_id from acs_objects where object_id = ${target_package_id})"]
+ set qtip "
${title} shared from ${instance_name}
"
+ set icon ""
+ set content_size_pretty ""
+ }
url {
set icon ""
set download_url $url
@@ -153,22 +189,26 @@
}
}
+ # cleanup :
+ # remove double quotes, replace with single quotes
+ regsub -all "\"" $title "" title
+
# filename and download url
- set filename " "
+ if { $type != "folder" && $type != "symlink"} {
- if { $type != "folder"} {
-
if { ![exists_and_not_null download_url] } {
set download_url "${fs_url}download/${name}?[export_vars {{file_id $object_id}}]"
+ set linkurl "${fs_url}download/?[export_vars {{file_id $object_id}}]"
}
set filename $name
-
+ if { $title == $name } { set filename " "}
} else {
set download_url "javascript:void(0)"
-
+ set linkurl "javascript:void(0)"
+ set filename " "
}
# get the tags for this fs item
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-tagcloud.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-tagcloud.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-tagcloud.tcl 26 Nov 2007 12:52:45 -0000 1.1
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-tagcloud.tcl 13 Dec 2007 05:33:42 -0000 1.2
@@ -28,16 +28,7 @@
set user_id [ad_conn user_id]
}
-# set subsite_p [myweb::subsite_p -ancestor_subsite_id $ancestor_subsite_id]
-# set application_group_id [application_group::group_id_from_package_id -package_id $ancestor_subsite_id]
-# set limit_clause {
-# and m.object_id in (select p.object_id
-# from acs_permissions_all p, fs_objects e
-# where p.object_id = e.object_id
-# and p.grantee_id = :application_group_id
-# and p.privilege = 'read')
-#}
-# set limit_clause "and m.object_id in (select object_id from acs_objects where package_id = $package_id)"
+set limit_clause "and m.object_id in (select object_id from acs_objects where package_id = $package_id)"
db_multirow -extend { url } connections connections [subst {
select c.category_id, t.name, count(*) as count, o.creation_user
@@ -47,6 +38,7 @@
and t.locale = :locale
and c.category_id = m.category_id
and c.category_id = o.object_id
+$limit_clause
group by t.name, o.creation_date, o.creation_user, c.category_id
order by t.name}] {
set url "javascript:void(0)"
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/list-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/list-communities.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/list-communities.adp 13 Dec 2007 05:33:42 -0000 1.1
@@ -0,0 +1,5 @@
+{"communities":[
+
+{"target_folder_id":"@results.target_folder_id@","instance_name":"@results.instance_name;noquote@"}
+
+]}
\ No newline at end of file
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/list-communities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/list-communities.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/list-communities.tcl 13 Dec 2007 05:33:42 -0000 1.1
@@ -0,0 +1,34 @@
+ad_page_contract {
+
+ Create a list of communities that the user will choose from to share a folder
+
+ @author Hamilton Chua (ham@solutiongrove.com)
+ @creation-date 2007-11-30
+
+} {
+ {query ""}
+}
+
+set user_id [ad_conn user_id]
+
+set query_name dbqd.file-storage.www.folder-share.target_folders
+
+db_multirow -extend { instance_name } communities $query_name "" {
+ set instance_name [site_node::closest_ancestor_package -node_id $node_id -package_key acs-subsite -element instance_name]
+}
+
+template::multirow sort communities instance_name
+
+template::multirow create results target_folder_id instance_name
+
+if { [exists_and_not_null query] } {
+ template::multirow foreach communities {
+ if { [string match "*[string toupper ${query}]*" [string toupper $instance_name]] } {
+ template::multirow append results $target_folder_id $instance_name
+ }
+ }
+} else {
+ template::multirow foreach communities {
+ template::multirow append results $target_folder_id $instance_name
+ }
+}
\ No newline at end of file
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes-postgresql.xql 26 Nov 2007 12:52:45 -0000 1.1
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes-postgresql.xql 13 Dec 2007 05:33:42 -0000 1.2
@@ -15,13 +15,14 @@
fs_objects.name,
fs_objects.title,
fs_objects.parent_id,
+ fs_objects.type,
case
when fs_objects.type = 'url'
then ( select acs_permission__permission_p(fs_objects.object_id, :viewing_user_id, 'write') from dual)
else 't'
end as write_p
from fs_objects
- where fs_objects.type='folder'
+ where fs_objects.type in ('folder','symlink')
and fs_objects.parent_id = :node
and exists (select 1
from acs_object_party_privilege_map m
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.adp 26 Nov 2007 12:52:45 -0000 1.1
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.adp 13 Dec 2007 05:33:42 -0000 1.2
@@ -1 +1 @@
-[{"text":"@treenodes.name@","id":"@treenodes.id;noquote@","iconCls":"folder","singleClickExpand":true,"attributes":{"write_p":"@treenodes.write_p@"}}]
\ No newline at end of file
+[{"text":"@treenodes.name@","qtip":"@treenodes.qtip;noquote@","id":"@treenodes.id;noquote@","iconCls":"@treenodes.cls;noquote@","singleClickExpand":true,"attributes":{"write_p":"@treenodes.write_p@","type":"@treenodes.type;noquote@","symlink_id":"@treenodes.symlink_id@"}}]
\ No newline at end of file
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl 26 Nov 2007 12:52:45 -0000 1.1
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl 13 Dec 2007 05:33:42 -0000 1.2
@@ -23,22 +23,49 @@
set node [fs::get_root_folder -package_id $package_id]
}
-db_multirow -extend { text id href cls leaf } "treenodes" "treenodes" { } {
+db_multirow -extend { text id href cls qtip symlink_id } "treenodes" "treenodes" { } {
- set child_count [db_string "count_children" "select count(*) from fs_objects where parent_id = :object_id and type='folder'"]
-
if { [exists_and_not_null title] } {
set text $title
} else {
set text $name
}
+ set symlink_id ""
set id "$object_id"
set cls "folder"
- set leaf "true"
- if { $child_count > 0 } {
- set leaf "false"
+ if { $type == "symlink" } {
+ set cls "symlink"
+ set target_id [db_string get_target_folder "select target_id from cr_symlinks where symlink_id=:object_id"]
+ set symlink_id $id
+ set id $target_id
+ set target_package_id [ajaxfs::get_root_folder -folder_id $target_id]
+ set instance_name [db_string get_subsite_name "select instance_name from apm_packages where package_id=(select context_id from acs_objects where object_id = ${target_package_id})"]
+ set qtip "${text} shared from ${instance_name}"
+ } else {
+ set shared_with [db_list get_share_from "select p.instance_name
+ from cr_folders f,
+ cr_symlinks s,
+ cr_items i,
+ acs_objects o,
+ apm_packages p,
+ site_nodes s1,
+ site_nodes s2
+ where o.package_id = s2.object_id
+ and s1.node_id = s2.parent_id
+ and s1.object_id = p.package_id
+ and s.symlink_id = o.object_id
+ and s.symlink_id = i.item_id
+ and s.target_id = :object_id
+ and f.folder_id=i.parent_id"]
+ if { [llength $shared_with] > 0} {
+ set cls "sharedfolder"
+ set qtip "
${text} is shared with
[join ${shared_with} "
"]
"
+ } else {
+ set cls "folder"
+ set qtip $text
+ }
}
}
\ No newline at end of file
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/share-folder.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/share-folder.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/share-folder.adp 13 Dec 2007 05:33:42 -0000 1.1
@@ -0,0 +1 @@
+@result;noquote@
\ No newline at end of file
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/share-folder.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/share-folder.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/share-folder.tcl 13 Dec 2007 05:33:42 -0000 1.1
@@ -0,0 +1,32 @@
+ad_page_contract {
+ Share a folder with another file storage instance,
+ create a symlink in the target
+} {
+ target_folder_id
+ folder_id
+}
+
+set result 1
+set user_id [ad_conn user_id]
+
+# create a symlink for each target community
+set symlink_id [content::symlink::new \
+ -target_id $folder_id \
+ -parent_id $target_folder_id \
+ -label [content::folder::get_label -folder_id $folder_id]]
+
+# give permission to the owners of the root folder
+# get subsite application group for the target file-storage
+# and grant admin over the original folder
+set target_package_id [lindex \
+ [fs::get_folder_package_and_root $target_folder_id] 0]
+set target_subsite_package_id [site_node::closest_ancestor_package -node_id [site_node::get_node_id_from_object_id -object_id $target_package_id]]
+set target_application_group [application_group::group_id_from_package_id -package_id $target_subsite_package_id]
+set target_admins [group::get_rel_segment -group_id $target_application_group -type "admin_rel"]
+set target_members [group::get_rel_segment -group_id $target_application_group -type "membership_rel"]
+foreach {type privilege} {admins admin members read members create members delete members write} {
+ permission::grant \
+ -object_id $folder_id \
+ -party_id [set target_$type] \
+ -privilege $privilege
+}
"
+ } else {
+ set qtip "${title}"
+ set icon "
"
+ }
}
+ symlink {
+ set target_id [db_string get_target_folder "select target_id from cr_symlinks where symlink_id=:object_id"]
+ set symlink_id $object_id
+ set object_id $target_id
+ set target_package_id [ajaxfs::get_root_folder -folder_id $target_id]
+ set instance_name [db_string get_subsite_name "select instance_name from apm_packages where package_id=(select context_id from acs_objects where object_id = ${target_package_id})"]
+ set qtip "
"
+ set content_size_pretty ""
+ }
url {
set icon "
"
set download_url $url
@@ -153,22 +189,26 @@
}
}
+ # cleanup :
+ # remove double quotes, replace with single quotes
+ regsub -all "\"" $title "" title
+
# filename and download url
- set filename " "
+ if { $type != "folder" && $type != "symlink"} {
- if { $type != "folder"} {
-
if { ![exists_and_not_null download_url] } {
set download_url "${fs_url}download/${name}?[export_vars {{file_id $object_id}}]"
+ set linkurl "${fs_url}download/?[export_vars {{file_id $object_id}}]"
}
set filename $name
-
+ if { $title == $name } { set filename " "}
} else {
set download_url "javascript:void(0)"
-
+ set linkurl "javascript:void(0)"
+ set filename " "
}
# get the tags for this fs item
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-tagcloud.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-tagcloud.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-tagcloud.tcl 26 Nov 2007 12:52:45 -0000 1.1
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-tagcloud.tcl 13 Dec 2007 05:33:42 -0000 1.2
@@ -28,16 +28,7 @@
set user_id [ad_conn user_id]
}
-# set subsite_p [myweb::subsite_p -ancestor_subsite_id $ancestor_subsite_id]
-# set application_group_id [application_group::group_id_from_package_id -package_id $ancestor_subsite_id]
-# set limit_clause {
-# and m.object_id in (select p.object_id
-# from acs_permissions_all p, fs_objects e
-# where p.object_id = e.object_id
-# and p.grantee_id = :application_group_id
-# and p.privilege = 'read')
-#}
-# set limit_clause "and m.object_id in (select object_id from acs_objects where package_id = $package_id)"
+set limit_clause "and m.object_id in (select object_id from acs_objects where package_id = $package_id)"
db_multirow -extend { url } connections connections [subst {
select c.category_id, t.name, count(*) as count, o.creation_user
@@ -47,6 +38,7 @@
and t.locale = :locale
and c.category_id = m.category_id
and c.category_id = o.object_id
+$limit_clause
group by t.name, o.creation_date, o.creation_user, c.category_id
order by t.name}] {
set url "javascript:void(0)"
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/list-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/list-communities.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/list-communities.adp 13 Dec 2007 05:33:42 -0000 1.1
@@ -0,0 +1,5 @@
+{"communities":[
+