Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Typo in EmptyNodeProvider
Browse files Browse the repository at this point in the history
Fix user history and ?goTo= mechanism. If skip_user_history is fale, use goTo, otherwise use URL directly.
  • Loading branch information
cdujeu committed Nov 27, 2015
1 parent 7cb5725 commit 78de82d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion core/src/plugins/core.conf/manifest.xml
Expand Up @@ -29,7 +29,7 @@
<param name="USER_SHARED_USERS_LIMIT" scope="user" description="CONF_MESSAGE[Maximum number of shared users per user]" label="CONF_MESSAGE[Shared users limit]" type="integer" expose="false" editable="false"/>
<global_param name="DIBI_PRECONFIGURATION" group="CONF_MESSAGE[Core SQL Connexion]" type="group_switch:dibi_provider" label="CONF_MESSAGE[SQL Connexion]" description="CONF_MESSAGE[Simple SQL Connexion definition that can be used by other sql-based plugins]" mandatory="false"/>
<global_param name="SAVE_GUEST_PREFERENCES" group="CONF_MESSAGE[Preferences Saving]" type="boolean" label="CONF_MESSAGE[Remember guest preferences]" description="CONF_MESSAGE[If the 'guest' user is enabled, remember her preferences accross sessions.]" mandatory="true" default="false"/>
<global_param name="SKIP_USER_HISTORY" group="CONF_MESSAGE[Preferences Saving]" type="boolean" label="CONF_MESSAGE[Skip user history]" description="CONF_MESSAGE[Use this option to avoid automatic reloading of the interface state (last folder, opened tabs, etc)]" mandatory="false" default="true"/>
<global_param name="SKIP_USER_HISTORY" expose="true" group="CONF_MESSAGE[Preferences Saving]" type="boolean" label="CONF_MESSAGE[Skip user history]" description="CONF_MESSAGE[Use this option to avoid automatic reloading of the interface state (last folder, opened tabs, etc)]" mandatory="false" default="true"/>

<global_param name="USER_CREATE_REPOSITORY" group="CONF_MESSAGE[Worskpace creation delegation]" type="boolean" label="CONF_MESSAGE[Let user create repositories from templates]" description="CONF_MESSAGE[Whether users can create their own repositories, based on predefined templates.]" mandatory="false" default="false"/>

Expand Down
Expand Up @@ -18,7 +18,7 @@ class EmptyNodeProvider extends Observable{

}

loadLeafNodeSyncfunction(node, callback){
loadLeafNodeSync(node, callback){

}

Expand Down
22 changes: 13 additions & 9 deletions core/src/plugins/gui.ajax/res/js/ui/prototype/class.PydioUI.js
Expand Up @@ -188,17 +188,21 @@ Class.create("PydioUI", {
var path = this.getContextNode().getPath();
var appTitle = pydioObject.Parameters.get("customWording").title || "Pydio";
document.title = appTitle + ' - '+(getBaseName(path)?getBaseName(path):'/');
/*
TODO: should be sent somewhere else
if(this.skipLsHistory || !this.user || !this.user.getActiveRepository()) return;

// Auto Save
if(pydioObject.skipLsHistory || !pydioObject.user || !pydioObject.user.getActiveRepository()
|| pydio.getPluginConfigs("core.conf").get("SKIP_USER_HISTORY") === true) {
return;
}
window.setTimeout(function(){
var data = this.user.getPreference("ls_history", true) || {};
var data = pydioObject.user.getPreference("ls_history", true) || {};
data = new Hash(data);
data.set(this.user.getActiveRepository(), this.getContextNode().getPath());
this.user.setPreference("ls_history", data, true);
this.user.savePreference("ls_history");
}.bind(this), 100 );
*/
data.set(pydioObject.user.getActiveRepository(), pydioObject.getContextNode().getPath());
pydioObject.user.setPreference("ls_history", data, true);
pydioObject.user.savePreference("ls_history");
}.bind(this), 200 );


}.bind(pydioObject) );
modal.updateLoadingProgress('Actions Initialized');

Expand Down

0 comments on commit 78de82d

Please sign in to comment.