senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some merge bugs

Browse Source
This commit is contained in:
Senad Uka
2015-01-28 05:09:53 +01:00
parent c35d8a57de
commit 1445e8f702
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
front-ui/app/components/items/itemWithDetailsPage.js
View File

@@ -41,19 +41,13 @@ var ItemWithDetailsPage = React.createClass({
}, },
_onChange: function () { _onChange: function () {
<<<<<<< HEAD
if (this.isMounted()) { if (this.isMounted()) {
this.setState({ this.setState({
item: ItemStore.getLoadedItemWithDetails() item: ItemStore.getLoadedItemWithDetails()
}); });
} }
=======
if(this.isMounted()) {
this.setState({
item: ItemStore.getSelectedItem()
});
}
>>>>>>> f0f25b10c0e909df4f366e132f46834a56493e8d
}, },
getInitialState: function () { getInitialState: function () {

3
front-ui/app/router.js
View File

@@ -13,12 +13,11 @@ var StartPage = require('./components/startPage/startPage');
var ByCategory = require('./components/browsing/byCategory'); var ByCategory = require('./components/browsing/byCategory');
var BySection = require('./components/browsing/bySection'); var BySection = require('./components/browsing/bySection');
var ItemPage = require('./components/items/itemPage');
var routes = ( var routes = (
<Route name='app' path='/' handler={RootApp}> <Route name='app' path='/' handler={RootApp}>
<Route name='sekcija' path='sekcija/:id/:name' handler={BySection} /> <Route name='sekcija' path='sekcija/:id/:name' handler={BySection} />
<Route name='artikal' path="artikal/:id/*" handler={ItemPage} /> <Route name='artikal' path="artikal/:id/*" handler={ItemWithDetailsPage} />
<Route name='byCat' path="sekcija/:sekcijaName/kategorija/:id/*" handler={ByCategory} /> <Route name='byCat' path="sekcija/:sekcijaName/kategorija/:id/*" handler={ByCategory} />
<DefaultRoute handler={StartPage}/> <DefaultRoute handler={StartPage}/>
</Route> </Route>