You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/10/23 19:38:04 UTC
[38/45] allura git commit: [#7919] Make _nav.json's keys backwards
compatible
[#7919] Make _nav.json's keys backwards compatible
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a6d53393
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a6d53393
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a6d53393
Branch: refs/heads/hs/7919
Commit: a6d53393f71dd2208ec172e46810d9456882d101
Parents: 9497a73
Author: Heith Seewald <hs...@hsmb.local>
Authored: Fri Oct 16 13:28:28 2015 -0400
Committer: Heith Seewald <hs...@hsmb.local>
Committed: Fri Oct 23 13:10:04 2015 -0400
----------------------------------------------------------------------
Allura/allura/model/project.py | 2 +-
Allura/allura/public/nf/js/navbar.es6.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/a6d53393/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 550f95c..e40f1a5 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -632,7 +632,7 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
children.append(entry)
return json.dumps(dict(grouping_threshold=grouping_threshold,
- children=children,
+ menu=children,
child_count=i))
def grouped_navbar_entries(self):
http://git-wip-us.apache.org/repos/asf/allura/blob/a6d53393/Allura/allura/public/nf/js/navbar.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/navbar.es6.js b/Allura/allura/public/nf/js/navbar.es6.js
index ecd0fad..feb1af8 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -713,13 +713,13 @@ var Main = React.createClass({
var navBarSwitch = (showAdmin) => {
if (showAdmin) {
return (
- <AdminNav tools={ _this.state.data.children } data={ _this.state.data } onToolReorder={ _this.onToolReorder }
+ <AdminNav tools={ _this.state.data.menu } data={ _this.state.data } onToolReorder={ _this.onToolReorder }
onUpdateMountOrder={ _this.onUpdateMountOrder } editMode={ _this.state.visible } />
);
} else {
return (
<div>
- <NormalNavBar items={ _this.state.data.children } key={ `normalNav-${_.uniqueId()}` }/>
+ <NormalNavBar items={ _this.state.data.menu } key={ `normalNav-${_.uniqueId()}` }/>
<ToggleAddNewTool handleToggleAddNewTool={this.handleToggleAddNewTool} showMenu={this.state.showAddToolMenu} />
</div>
)