An error occurred while retrieving approval data for this merge request.
1 unresolved thread
Activity
added 62 commits
-
e7702103...d78f07c1 - 61 commits from branch
dss:master
- 582434a4 - DSD-1981 add public API for floors
-
e7702103...d78f07c1 - 61 commits from branch
assigned to @jeanvisagie
1841 } 1842 result.floors.push_back( 1843 {.id = ds::str(floor->getID()), 1844 .type = "floor", 1845 .attributes = {.name = floor->getName(), .orderId = floor->getOrder(), .zones = floorIds}}); 1846 } 1847 return result; 1848 } 1849 1850 void setFloorNameById(const dsModel::FloorArgs& args, const std::string& value) override { 1851 DS_NOTICE("Set floor name", args, value); 1852 DS_REQUIRE(!value.empty(), "New name cannot be empty."); 1853 auto floor = m_apartment.tryGetFloor(strToInt(args.floorId)); 1854 if (auto floorPtr = floor.lock()) { 1855 floorPtr->setName(value); 1856 m_apartment.getModelMaintenance()->addModelEvent(new ModelEvent(ModelEvent::etModelDirty)); changed this line in version 4 of the diff
- Resolved by Christian Hitz
- Resolved by Christian Hitz
added 9 commits
-
582434a4...81468ffd - 8 commits from branch
dss:master
- b1857330 - DSD-1981 add public API for floors
-
582434a4...81468ffd - 8 commits from branch
enabled an automatic merge when the pipeline for 14d8d9db succeeds
mentioned in commit 37e9c0e4