Skip to content

Commit

Permalink
Merge pull request pencilblue#357 from pencilblue/PB356
Browse files Browse the repository at this point in the history
fixed pencilblue#355 and pencilblue#356 (portfolio issues)
  • Loading branch information
blakecallens committed Dec 7, 2014
2 parents cc196e6 + a8e5764 commit 502558f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions plugins/portfolio/controllers/home_page_settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ HomePageSettings.prototype.render = function(cb) {
name: 'content_settings',
title: self.ls.get('HOME_PAGE_SETTINGS'),
icon: 'chevron-left',
href: '/admin/plugins/settings/portfolio'
href: '/admin/plugins/portfolio/settings'
}];

var dao = new pb.DAO();
Expand All @@ -54,7 +54,7 @@ HomePageSettings.prototype.render = function(cb) {
homePageSettings = homePageSettings[0];
}
else {
homePageSettings = {callouts: []};
homePageSettings = {callouts: [{}, {}, {}]};
}

var mservice = new pb.MediaService();
Expand Down Expand Up @@ -94,7 +94,7 @@ HomePageSettings.getRoutes = function(cb) {
var routes = [
{
method: 'get',
path: '/admin/plugins/settings/portfolio/home_page',
path: '/admin/plugins/portfolio/settings/home_page',
auth_required: true,
access_level: ACCESS_EDITOR,
content_type: 'text/html'
Expand Down
2 changes: 1 addition & 1 deletion plugins/portfolio/portfolio.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Portfolio.onStartup = function(cb) {
name: 'home_page_settings',
title: 'Home page settings',
icon: 'home',
href: '/admin/plugins/settings/portfolio/home_page'
href: '/admin/plugins/portfolio/settings/home_page'
}
];
}
Expand Down

0 comments on commit 502558f

Please sign in to comment.