Skip to content

Commit

Permalink
Merge branch 'hotfix/0.105.17' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
brianjgeiger committed Apr 5, 2017
2 parents 7ce83e4 + c1bd648 commit e71d98b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions website/static/js/logTextParser.js
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ var LogPieces = {
path: {
controller: function(logObject){
var self = this;
self.returnLinkForPath = function() {
self.returnLinkForPath = function(logObject) {
if (logObject) {
var action = logObject.attributes.action;
var acceptableLinkedItems = ['osf_storage_file_added', 'osf_storage_file_updated', 'file_tag_added', 'file_tag_removed',
Expand All @@ -453,15 +453,15 @@ var LogPieces = {
};
},
view: function (ctrl, logObject) {
var url = ctrl.returnLinkForPath();
var url = ctrl.returnLinkForPath(logObject);
return returnTextParams('path', 'a file', logObject, url);
}
},
//
filename: {
controller: function(logObject) {
var self = this;
self.returnLinkForPath = function(){
self.returnLinkForPath = function(logObject){
if (logObject){
var action = logObject.attributes.action;
var acceptableLinkedItems = ['dataverse_file_added'];
Expand All @@ -473,7 +473,7 @@ var LogPieces = {
};
},
view: function (ctrl, logObject) {
var url = ctrl.returnLinkForPath();
var url = ctrl.returnLinkForPath(logObject);
return returnTextParams('filename', 'a title', logObject, url);
}
},
Expand Down Expand Up @@ -557,7 +557,7 @@ var LogPieces = {
googledrive_path: {
controller: function(logObject){
var self = this;
self.returnLinkForPath = function() {
self.returnLinkForPath = function(logObject) {
if (logObject) {
var action = logObject.attributes.action;
var acceptableLinkedItems = ['googledrive_file_added', 'googledrive_file_updated'];
Expand All @@ -569,7 +569,7 @@ var LogPieces = {
};
},
view: function (ctrl, logObject) {
var url = ctrl.returnLinkForPath();
var url = ctrl.returnLinkForPath(logObject);
var path = logObject.attributes.params.path;
if(paramIsReturned(path, logObject)){
path = stripBackslash(decodeURIComponent(path));
Expand Down

0 comments on commit e71d98b

Please sign in to comment.