Fix Breadcrumb display when in RecycleBin

Fix "Empty" action appearing only if a file is selected. Upgrade "Index" icon.
pydio · May 23, 2017 · b955172 · b955172
1 parent cbbcbb1
commit b955172
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/core/src/plugins/access.fs/fsActions.xml b/core/src/plugins/access.fs/fsActions.xml
@@ -85,9 +85,7 @@
 		</action>
 		<action name="empty_recycle">
 			<gui text="220" title="221" iconClass="mdi mdi-delete-forever" accessKey="empty_recycle_access_key" hasAccessKey="true">
-				<context selection="true" dir="true" recycle="only" actionBar="true"
-                         contextMenu="true" infoPanel="false" actionBarGroup="change_main"/>
-                <selectionContext dir="false" file="false" recycle="true" unique="true"/>
+				<context selection="false" dir="true" recycle="only" actionBar="true" contextMenu="true" infoPanel="false" actionBarGroup="info_panel,change_main"/>
 			</gui>
 			<rightsContext noUser="true" userLogged="" read="true" write="true" adminOnly=""/>
 			<processing>

diff --git a/core/src/plugins/core.index/manifest.xml b/core/src/plugins/core.index/manifest.xml
@@ -10,7 +10,7 @@
     <registry_contributions>
         <actions>
             <action name="index">
-                <gui text="core.index.1" title="core.index.2" iconClass="icon-book" accessKey="folder_access_key">
+                <gui text="core.index.1" title="core.index.2" iconClass="mdi mdi-library-books" accessKey="folder_access_key">
                     <context selection="false" dir="true" recycle="hidden" actionBar="true" contextMenu="true" infoPanel="false" actionBarGroup="other" inZip="false"/>
                 </gui>
                 <rightsContext noUser="true" userLogged="only" read="true"

diff --git a/core/src/plugins/gui.ajax/res/js/ui/Workspaces/views/Breadcrumb.js b/core/src/plugins/gui.ajax/res/js/ui/Workspaces/views/Breadcrumb.js
@@ -71,17 +71,17 @@ let Breadcrumb = React.createClass({
             repoLabel = pydio.user.repositories.get(pydio.user.activeRepository).getLabel();
         }
         let segments = [];
-        let path = this.state.node ? LangUtils.trimLeft(this.state.node.getPath(), '/') : '';
+        const path = this.state.node ? LangUtils.trimLeft(this.state.node.getPath(), '/') : '';
+        const label = this.state.node ? this.state.node.getLabel() : '';
         let rebuilt = '';
-        let i = 0;
         let mainStyle = this.props.rootStyle || {};
         mainStyle = {...styles.main, ...mainStyle};
-        path.split('/').map(function(seg){
+        const parts = path.split('/');
+        parts.forEach(function(seg, i){
             if(!seg) return;
             rebuilt += '/' + seg;
             segments.push(<span key={'bread_sep_' + i} className="separator"> / </span>);
-            segments.push(<span key={'bread_' + i} className="segment" onClick={this.goTo.bind(this, rebuilt)}>{seg}</span>);
-            i++;
+            segments.push(<span key={'bread_' + i} className="segment" onClick={this.goTo.bind(this, rebuilt)}>{i===parts.length-1 ? label : seg}</span>);
         }.bind(this));
         return (
             <Textfit mode="single" perfectFit={false} min={12} max={22} className="react_breadcrumb" style={mainStyle}>