Menu
▾
▴
[eGroupWare-svn] r53548 - in /trunk: admin/inc/ etemplate/inc/ etemplate/js/ etemplate/templates/default/
|
From: <nat...@us...> - 2015-09-02 19:52:55
|
Author: nathangray Date: Wed Sep 2 21:52:47 2015 New Revision: 53548 URL: http://svn.stylite.de/viewvc/egroupware?rev=53548&view=rev Log: Add filemanager custom field type using vfs-upload Modified: trunk/admin/inc/class.customfields.inc.php trunk/etemplate/inc/class.etemplate_widget_customfields.inc.php trunk/etemplate/inc/class.etemplate_widget_vfs.inc.php trunk/etemplate/js/et2_extension_customfields.js trunk/etemplate/js/et2_widget_file.js trunk/etemplate/js/et2_widget_vfs.js trunk/etemplate/templates/default/etemplate2.css Modified: trunk/admin/inc/class.customfields.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/inc/class.customfields.inc.php?rev=53548&r1=53547&r2=53548&view=diff ============================================================================== --- trunk/admin/inc/class.customfields.inc.php (original) +++ trunk/admin/inc/class.customfields.inc.php Wed Sep 2 21:52:47 2015 @@ -90,6 +90,7 @@ 'ajax_select' => array('cf_values' => true), 'radio' => array('cf_values' => true), 'checkbox' => array('cf_values' => true), + 'filemanager' => array('cf_values' => true), ); /** Modified: trunk/etemplate/inc/class.etemplate_widget_customfields.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.etemplate_widget_customfields.inc.php?rev=53548&r1=53547&r2=53548&view=diff ============================================================================== --- trunk/etemplate/inc/class.etemplate_widget_customfields.inc.php (original) +++ trunk/etemplate/inc/class.etemplate_widget_customfields.inc.php Wed Sep 2 21:52:47 2015 @@ -41,7 +41,6 @@ 'select-account' => 'Select account', 'button' => 'Button', // button to execute javascript 'url' => 'Url', - 'url-email'=> 'EMail', 'url-phone'=> 'Phone number', 'htmlarea' => 'Formatted Text (HTML)', 'link-entry' => 'Select entry', // should be last type, as the individual apps get added behind @@ -265,7 +264,14 @@ // Link-tos needs to change from appname to link-to if($link_types[$field['type']]) { - $type = 'link-to'; + if($type == 'filemanager') + { + $type = 'vfs-upload'; + } + else + { + $type = 'link-to'; + } } $widget = self::factory($type, '<'.$type.' type="'.$type.'" id="'.self::$prefix.$fname.'"/>', self::$prefix.$fname); $widget->id = self::$prefix.$fname; @@ -281,6 +287,12 @@ if($field['values']['max']) $widget->attrs['min'] = $field['values']['max']; break; + case 'vfs-upload': + $widget->attrs['path'] = $field['app'] . ':' . + self::expand_name('$cont['.egw_link::get_registry($field['app'],'view_id').']',0,0,0,0,self::$request->content). + ':'.$field['label']; + break; + case 'link-to': $widget->attrs['only_app'] = $field['type']; break; Modified: trunk/etemplate/inc/class.etemplate_widget_vfs.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.etemplate_widget_vfs.inc.php?rev=53548&r1=53547&r2=53548&view=diff ============================================================================== --- trunk/etemplate/inc/class.etemplate_widget_vfs.inc.php (original) +++ trunk/etemplate/inc/class.etemplate_widget_vfs.inc.php Wed Sep 2 21:52:47 2015 @@ -31,12 +31,21 @@ */ public function beforeSendToClient($cname, $expand = array()) { - if($this->type == 'vfs-upload') + if($this->type == 'vfs-upload' || $this->attrs['type'] == 'vfs-upload') { $form_name = self::form_name($cname, $this->id, $expand ? $expand : array('cont'=>self::$request->content)); - + if($this->attrs['path']) + { + $path = $this->attrs['path']; + } + else + { + $path = $this->id; + } + + $this->setElementAttribute($form_name, 'path', $path); // ID maps to path - check there for any existing files - list($app,$id,$relpath) = explode(':',$this->id,3); + list($app,$id,$relpath) = explode(':',$path,3); if($app && $id) { if(!is_numeric($id)) @@ -52,24 +61,44 @@ $path = egw_link::vfs_path($app,$id,'',true); if (!empty($relpath)) $path .= '/'.$relpath; + $value = array(); + // Single file, already existing if (substr($path,-1) != '/' && egw_vfs::file_exists($path) && !egw_vfs::is_dir($path)) { $file = egw_vfs::stat($path); - $file['path'] = egw_vfs::resolve_url($path); + $file['path'] = $path; $file['name'] = egw_vfs::basename($file['path']); $file['mime'] = egw_vfs::mime_content_type($file['path']); $value = array($file); } + // Single file, missing extension in path + else if (substr($path, -1) != '/' && !egw_vfs::file_exists($path) && $relpath && substr($relpath,-4,1) !== '.') + { + $find = egw_vfs::find(substr($path,0, - strlen($relpath)), array( + 'type' => 'f', + 'maxdepth' => 1, + 'name' => $relpath . '*' + )); + foreach($find as $file) + { + $file_info = egw_vfs::stat($file); + $file_info['path'] = $file; + $file_info['name'] = egw_vfs::basename($file_info['path']); + $file_info['mime'] = egw_vfs::mime_content_type($file_info['path']); + $value[] = $file_info; + } + } else if (substr($path, -1) == '/' && egw_vfs::is_dir($path)) { - $value = egw_vfs::scandir($path); - foreach($value as &$file) + $scan = egw_vfs::scandir($path); + foreach($scan as $file) { - $file = egw_vfs::stat("$path$file"); - $file['path'] = $file['url']; - $file['name'] = egw_vfs::basename($file['path']); - $file['mime'] = egw_vfs::mime_content_type($file['path']); + $file_info = egw_vfs::stat("$path$file"); + $file_info['path'] = "$path$file"; + $file_info['name'] = egw_vfs::basename($file_info['path']); + $file_info['mime'] = egw_vfs::mime_content_type($file_info['path']); + $value[] = $file_info; } } } @@ -80,7 +109,7 @@ parent::ajax_upload(); foreach($_FILES as $field => $file) { - self::store_file($_REQUEST['widget_id'], $file); + self::store_file($_REQUEST['path'] ? $_REQUEST['path'] : $_REQUEST['widget_id'], $file); } } Modified: trunk/etemplate/js/et2_extension_customfields.js URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_extension_customfields.js?rev=53548&r1=53547&r2=53548&view=diff ============================================================================== --- trunk/etemplate/js/et2_extension_customfields.js (original) +++ trunk/etemplate/js/et2_extension_customfields.js Wed Sep 2 21:52:47 2015 @@ -575,11 +575,21 @@ } }, _setup_link_entry: function(field_name, field, attrs) { + if(field.type === 'filemanager') + { + return this._setup_filemanager(field_name, field, attrs); + } // No label on the widget itself delete(attrs.label); attrs.type = "link-entry"; attrs.only_app = field.type; + return true; + }, + + _setup_filemanager: function(field_name, field, attrs) { + attrs.type = 'vfs-upload'; + delete(attrs.label); return true; }, Modified: trunk/etemplate/js/et2_widget_file.js URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_widget_file.js?rev=53548&r1=53547&r2=53548&view=diff ============================================================================== --- trunk/etemplate/js/et2_widget_file.js (original) +++ trunk/etemplate/js/et2_widget_file.js Wed Sep 2 21:52:47 2015 @@ -395,9 +395,9 @@ else { // Wrong mime type - show in the list of files - return self.createStatus( - self.egw().lang("File is of wrong type (%1 != %2)!", this.files[index].type, self.options.mime), - file_name + return this.createStatus( + this.egw().lang("File is of wrong type (%1 != %2)!", file.file.type, this.options.mime), + file ); } Modified: trunk/etemplate/js/et2_widget_vfs.js URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_widget_vfs.js?rev=53548&r1=53547&r2=53548&view=diff ============================================================================== --- trunk/etemplate/js/et2_widget_vfs.js (original) +++ trunk/etemplate/js/et2_widget_vfs.js Wed Sep 2 21:52:47 2015 @@ -645,6 +645,12 @@ attributes: { "value": { "type": "any", // Either nothing, or an object with file info + }, + "path": { + "name": "Path", + "description": "Upload files to the specified VFS path", + "type": "string", + "default": '' } }, legacyOptions: ["mime"], @@ -663,9 +669,13 @@ init: function(_parent, attrs) { this._super.apply(this, arguments); $j(this.node).addClass("et2_vfs"); - - // If the ID is a directory, allow multiple uploads - if(this.options.id.substr(-1) == '/') + + if(!this.options.path) + { + this.options.path = this.options.id; + } + // If the path is a directory, allow multiple uploads + if(this.options.path.substr(-1) == '/') { this.set_multiple(true); } @@ -674,16 +684,38 @@ /** * If there is a file / files in the specified location, display them + * Value is the information for the file[s] in the specified location. * * @param {Object[]} _value */ set_value: function(_value) { + // Remove previous + while(this._children.length > 0) + { + var node = this._children[this._children.length-1]; + this.removeChild(node); + node.free(); + } this.progress.empty(); this.list.empty(); - for(var i = 0; i < _value.length; i++) - { - this._addFile(_value[i]); - } + + // Set new + if(typeof _value == 'object' && _value && _value.length) + { + for(var i = 0; i < _value.length; i++) + { + this._addFile(_value[i]); + } + } + }, + + /** + * Value is determined by what's at the location specified by path + * + * @returns {null} + */ + getValue: function() { + return null; }, getDOMNode: function(sender) { @@ -706,9 +738,21 @@ } }, + /** + * Add in the request id + */ + beforeSend: function(form) + { + var instance = this.getInstanceManager(); + + var extra = this._super.apply(this, arguments); + extra.path = this.options.path; + return extra; + }, + _addFile: function(file_data) { var row = $j(document.createElement("tr")) - .attr("data-path", file_data.url) + .attr("data-path", file_data.path) .attr("draggable", "true") .appendTo(this.list); var mime = $j(document.createElement("td")) @@ -720,6 +764,40 @@ .appendTo(row); var mime = et2_createWidget('vfs-mime',{value: file_data},this); var vfs = et2_createWidget('vfs', {value: file_data}, this); + + // Add in delete button + if (!this.options.readonly) + { + var self = this; + var delete_button = $j(document.createElement("td")) + .appendTo(row); + $j("<div />") + .appendTo(delete_button) + // We don't use ui-icon because it assigns a bg image + .addClass("delete icon") + .bind( 'click', function() { + et2_dialog.show_dialog( + function(button) { + if(button == et2_dialog.YES_BUTTON) + { + egw.json("filemanager_ui::ajax_action", [ + 'delete', + [row.attr('data-path')], + '' + ], + function(data) { + if(data && data.errs == 0) {row.slideUp(row.remove);} + if(data && data.msg) { + self.egw().message(data.msg, data.errs == 0 ? 'success' : 'error'); + } + } + ).sendRequest(); + } + }, + egw.lang('Delete file?') + ); + }); + } } }); et2_register_widget(et2_vfsUpload, ["vfs-upload"]); Modified: trunk/etemplate/templates/default/etemplate2.css URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/templates/default/etemplate2.css?rev=53548&r1=53547&r2=53548&view=diff ============================================================================== --- trunk/etemplate/templates/default/etemplate2.css (original) +++ trunk/etemplate/templates/default/etemplate2.css Wed Sep 2 21:52:47 2015 @@ -767,7 +767,7 @@ .et2_link_list td.remark { font-style: italic; } -.et2_link_list td div.delete { +.et2_link_list td div.delete, .et2_vfs td div.delete { visibility: hidden; background-image: url("images/close.png"); background-position: center; @@ -775,12 +775,13 @@ padding: 0px; } .et2_link_list .icon img, -.et2_link_list .icon { +.et2_link_list .icon, +.et2_vfs .icon img, .et2_vfs .icon { width: 16px; height: 16px; display: inline-block; } -.et2_link_list tr:hover div.delete { +.et2_link_list tr:hover div.delete, .et2_vfs tr:hover div.delete { visibility: visible; } .egw_tooltip { @@ -872,6 +873,7 @@ } .et2_vfs td.icon { width: 16px; + max-width: 16px; } button.et2_vfs_btn { margin: 0; |