Skip to content

Issue#1075: Project global export empty if not requested by first PioneerAdmin #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
halfcurry wants to merge 3 commits into from
Closed

Issue#1075: Project global export empty if not requested by first PioneerAdmin #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d78bd7
Log statements to identify issue location
Apr 9, 2017
77f76b8
Disabled User DomainFilter
Apr 12, 2017
547abed
Undid changes of first commit
Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/org/sigmah/server/dao/impl/ProjectHibernateDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ public class ProjectHibernateDAO extends AbstractDAO<Project, Integer> implement
*/
@Override
public List<Project> getProjects(final Collection<ProjectModel> pmodels) {

// Disable the ActivityInfo filter on Userdatabase.
DomainFilters.disableUserFilter(em());

final TypedQuery<Project> query = em().createQuery("FROM Project p WHERE p.projectModel IN (:pmodels)", Project.class);
query.setParameter("pmodels", pmodels);
return query.getResultList();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sigmah/server/servlet/exporter/data/GlobalExportDataProjectProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ public Map<String, List<ExportDataCell[]>> generateGlobalExportData(final Intege

final ProjectDAO projectDao = injector.getInstance(ProjectDAO.class);
final List<Project> projects = projectDao.getProjects(pModels);

// project model and its projects
final Map<String, List<Project>> pModelProjectsMap = new HashMap<String, List<Project>>();
for (final Project project : projects) {
if (project.getDateDeleted() == null) {
final String pModelName = project.getProjectModel().getName();

List<Project> pModelProjects = pModelProjectsMap.get(pModelName);
if (pModelProjects == null) {
pModelProjects = new ArrayList<Project>();
Expand Down