Fix typo in Registry : user object is on _pydioObject, not self. Chec…

…k for ajxp_readonly to avoid proposing writeable editors.
pydio · Mar 24, 2016 · e1add8e · e1add8e
1 parent 056d152
commit e1add8e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/core/src/plugins/editor.pixlr/fake_error_pixlr.php b/core/src/plugins/editor.pixlr/fake_error_pixlr.php
@@ -0,0 +1,5 @@
+<br>
+<br>
+<br>
+<br>
+<div align="center" style="font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#AAA;font-weight:bold;">Error while opening Pixlr editor!</div>
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/Registry.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/Registry.es6
@@ -245,7 +245,7 @@ class Registry{
     findEditorsForMime (mime, restrictToPreviewProviders){
         var editors = [];
         var checkWrite = false;
-        if(this.user != null && !this.user.canWrite()){
+        if(this._pydioObject.user != null && !this._pydioObject.user.canWrite()){
             checkWrite = true;
         }
         this._extensionsRegistry.editor.forEach(function(el){

diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PydioUI.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PydioUI.js
@@ -72,7 +72,7 @@ Class.create("PydioUI", {
         if(!editorData){
             var selectedMime = getAjxpMimeType(selectedNode);
             var editors = this._pydio.Registry.findEditorsForMime(selectedMime, false);
-            if(editors.length && editors[0].openable){
+            if(editors.length && editors[0].openable && !(editors[0].write && selectedNode.getMetadata().get("ajxp_readonly") === "true")){
                 editorData = editors[0];
             }
         }