Fix #819 (missing log refresh button) and fix #820 (restore old "Copy as Text" button)

Author: cdujeu

core/src/plugins/access.ajxp_conf/ajxp_confActions.xml

@@ -518,47 +518,6 @@
 				</serverCallback>
 				</processing>
 		</action>
-		<action name="copyAsText">
-			<gui text="302" title="303" iconClass="icon-copy" src="editcopy.png" accessKey="" hasAccessKey="false">
-				<context selection="true" dir="" recycle="false"
-					actionBar="true" contextMenu="true" infoPanel="false"
-					actionBarGroup="change" inZip="false">
-				</context>
-				<selectionContext dir="false" file="true" recycle="false" unique="false" allowedMimes="log,testResult"  image="false" editable="false"/></gui>
-			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
-			<processing>
-				<clientCallback prepareModal="true"><![CDATA[
-					var onLoad = function(oForm){
-						var userSelection =  ajaxplorer.getUserSelection();
-						var nodes = userSelection.getSelectedNodes();
-						var firstNode = userSelection.getUniqueNode();
-		   		    	var copyDiv = $(oForm).select('textarea[id="text_copy"]')[0];
-		   		    	var attributes = ['date','ip','level','user','action','params'];
-			   		    var message = attributes.join("\t") + "\n\n";
-		   		    	nodes.each(function(node){
-		   		    		var meta = node.getMetadata();
-		   		    		for(var i=0;i<attributes.length;i++){
-		   		    			var attName = attributes[i];
-		   		    			if(attName == "ajxp_label") attName = "text";
-		   		    			message += meta.get(attName) + '\t';
-		   		    		}
-			   		    	message += '\n';
-		   		    	});
-		   		    	copyDiv.setValue(message);
-		   		    	copyDiv.select();
-					};
-					modal.showDialogForm('Delete', 'copy_as_text', onLoad, function(){
-						hideLightBox(true);
-						return false;
-					},null,true);
-					]]></clientCallback>
-				<clientForm id="copy_as_text"><![CDATA[
-				<div id="copy_as_text" action="copy" box_width="650">
-					<textarea id="text_copy" style="width:630px; height: 350px;"></textarea>
-				</div>
-				]]></clientForm>
-				</processing>
-		</action>
 	    <action name="user_update_right">
             <processing>
                 <serverCallback methodName="switchAction" restParams="/repository_id/user_id/right" checkParams="true" developerComment="Update a user access right on a given workspace.">

core/src/plugins/editor.ajxp_datagrid/ajxp_datagrid.css

@@ -1,5 +1,10 @@
 #ajxp_datagridbox{
     overflow: auto;
+    position: relative;
+}
+
+#ajxp_datagridbox div.action_bar.editor_action_bar{
+    top:1px;
 }
 
 #ajxp_datagridbox .tabrow{

core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js

@@ -40,6 +40,75 @@ Class.create("AjxpDataGridEditor", AbstractEditor, {
         this._lists = $A();
     },
 
+    addAction: function(aName){
+        if(aName == 'refresh' && this.fRP){
+            if(!this.htmlElement.down("#refreshButton")){
+                this.htmlElement.down(".editor_action_bar").insert('' +
+                    '<a id="refreshButton" class="icon-refresh" title="Refresh">' +
+                    '   <span message_id="235" class="actionbar_button_label">Refresh</span>' +
+                    '</a>');
+                this.htmlElement.down("#refreshButton").observe("click", function(){
+                    this.fRP.reloadDataModel();
+                }.bind(this));
+            }
+        }else if(aName == 'copy_as_text'){
+            if(!this.htmlElement.down("#copyAsTextButton")){
+                this.htmlElement.down(".editor_action_bar").insert('' +
+                    '<a id="copyAsTextButton" class="icon-copy" title="Copy">' +
+                    '   <span message_id="235" class="actionbar_button_label">Copy Selection</span>' +
+                    '</a>');
+                this.htmlElement.down("#copyAsTextButton").observe("click", function(){
+                    var nodes = this.fRP.getDataModel().getSelectedNodes();
+                    if(nodes){
+                        this.showCopyAsTextWindow(nodes);
+                    }
+                }.bind(this));
+            }
+
+        }
+    },
+
+    showCopyAsTextWindow: function(nodes){
+        if(!nodes.first()) {
+            alert('Please select at least one line');
+            return;
+        }
+        if(!$('copy_as_text')){
+            $('all_forms').insert('<div id="copy_as_text" action="copy" box_width="80%">' +
+                '   <textarea id="text_copy" style="width:100%; height: 450px;"></textarea>' +
+                '</div>');
+        }
+        var onLoad = function(oForm){
+            var copyDiv = $(oForm).select('textarea[id="text_copy"]')[0];
+            var exclude = ['icon','ajxp_mime','is_file','filename', 'ajxp_modiftime'];
+            var message = '';
+            var first = nodes.first();
+            var meta = first.getMetadata();
+            meta.each(function(pair){
+                if(exclude.indexOf(pair.key) == -1) {
+                    message += pair.key + '\t';
+                }
+            });
+            message += '\n\n';
+            nodes.each(function(node){
+                var meta = node.getMetadata();
+                meta.each(function(pair){
+                    if(exclude.indexOf(pair.key) == -1) {
+                        message += pair.value + '\t';
+                    }
+                });
+                message += '\n';
+            });
+            copyDiv.setValue(message);
+            copyDiv.select();
+        };
+        modal.prepareHeader('Export as text','', 'icon-copy');
+        modal.showDialogForm('Copy', 'copy_as_text', onLoad, function(){
+            hideLightBox(true);
+            return false;
+        },null,false);
+    },
+
     open : function($super, node){
         $super(node);
         this.node = node;
@@ -63,6 +132,10 @@ Class.create("AjxpDataGridEditor", AbstractEditor, {
             this.fRP._dataLoaded = false;
             this.fRP.showElement(true);
             this._lists.push(this.fRP);
+            var actions = this.node.getMetadata().get("grid_actions") || "";
+            $A(actions.split(",")).each(function(a){
+                this.addAction(a);
+            }.bind(this));
         }else{
             var i = 1;
             while(this.node.getMetadata().get("grid_datasource_" + i)){

core/src/plugins/log.sql/class.sqlLogDriver.php

@@ -309,9 +309,10 @@ public function xmlListLogFiles($nodeName="file", $year=null, $month=null, $root
                     $metadata = array(
                         "icon" => "toggle_log.png",
                         "date"=> $date,
-                        "ajxp_mime" => "datagrid",
-                        "grid_datasource" => "get_action=ls&dir=".urlencode($path),
-                        "grid_header_title" => "Application Logs for $date"
+                        "ajxp_mime"         => "datagrid",
+                        "grid_datasource"   => "get_action=ls&dir=".urlencode($path),
+                        "grid_header_title" => "Application Logs for $date",
+                        "grid_actions"      => "refresh,copy_as_text"
                     );
                     $xml_strings[$date] = AJXP_XMLWriter::renderNode($path, $date, true, $metadata, true, false);
                 }