allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [31/50] [abbrv] allura git commit: [#7919] Make _nav.json's keys backwards compatible
Date Fri, 30 Oct 2015 20:55:50 GMT
[#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/8d1fda86
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8d1fda86
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8d1fda86

Branch: refs/heads/db/7919
Commit: 8d1fda865839bc7aaac23be3bd67e2f48bedcac8
Parents: 7bd0db7
Author: Heith Seewald <hseewald@hsmb.local>
Authored: Fri Oct 16 13:28:28 2015 -0400
Committer: Heith Seewald <hseewald@hsmb.local>
Committed: Thu Oct 29 20:21:39 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/8d1fda86/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/8d1fda86/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>
                 )


Mime
View raw message