Fixed assigning a playlist to a user
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
This commit is contained in:
@@ -40,6 +40,8 @@ public class MusicFolderDao extends AbstractDao {
|
||||
private static final String QUERY_COLUMNS = "id, " + INSERT_COLUMNS;
|
||||
private final MusicFolderRowMapper rowMapper = new MusicFolderRowMapper();
|
||||
|
||||
private UserDao userDao;
|
||||
|
||||
/**
|
||||
* Returns all music folders.
|
||||
*
|
||||
@@ -60,7 +62,7 @@ public class MusicFolderDao extends AbstractDao {
|
||||
update(sql, musicFolder.getPath(), musicFolder.getName(), musicFolder.isEnabled(), musicFolder.getChanged());
|
||||
|
||||
Integer id = queryForInt("select max(id) from music_folder", 0);
|
||||
update("insert into music_folder_user (music_folder_id, username) select ?, username from user", id);
|
||||
update("insert into music_folder_user (music_folder_id, username) select ?, username from " + userDao.getUserTable(), id);
|
||||
LOG.info("Created music folder " + musicFolder.getPath());
|
||||
}
|
||||
|
||||
@@ -105,4 +107,7 @@ public class MusicFolderDao extends AbstractDao {
|
||||
}
|
||||
}
|
||||
|
||||
public void setUserDao(UserDao userDao) {
|
||||
this.userDao = userDao;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -358,7 +358,7 @@ public class UserDao extends AbstractDao {
|
||||
}
|
||||
}
|
||||
|
||||
private String getUserTable() {
|
||||
String getUserTable() {
|
||||
return userTableQuote + "user" + userTableQuote;
|
||||
}
|
||||
|
||||
|
||||
@@ -45,6 +45,7 @@
|
||||
|
||||
<bean id="musicFolderDao" class="org.libresonic.player.dao.MusicFolderDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
<property name="userDao" ref="userDao" />
|
||||
</bean>
|
||||
|
||||
<bean id="userDao" class="org.libresonic.player.dao.UserDao">
|
||||
|
||||
@@ -59,6 +59,7 @@ public abstract class DaoTestCaseBase extends TestCase {
|
||||
internetRadioDao.setDaoHelper(daoHelper);
|
||||
ratingDao.setDaoHelper(daoHelper);
|
||||
musicFolderDao.setDaoHelper(daoHelper);
|
||||
musicFolderDao.setUserDao(userDao);
|
||||
userDao.setDaoHelper(daoHelper);
|
||||
transcodingDao.setDaoHelper(daoHelper);
|
||||
podcastDao.setDaoHelper(daoHelper);
|
||||
|
||||
Reference in New Issue
Block a user