X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.suite.e4%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fe4%2Fparts%2FDefaultDashboardEditor.java;h=259ea430983f4e8d1d82e3baafe1326e2c322edd;hb=0640a2e720d001b3ac26a900fb9e7eddd8c4ee99;hp=5fd2f562bd901d591183c07e90744d8d6dbcf67c;hpb=a5867ac26310d8610f84fc054f513ae6c19d91fb;p=gpl%2Fargeo-suite.git
diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
index 5fd2f56..259ea43 100644
--- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
@@ -28,6 +28,7 @@ import org.argeo.connect.util.ConnectJcrUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.jcr.JcrUtils;
import org.argeo.node.NodeUtils;
+import org.argeo.suite.e4.SuiteMsg;
import org.argeo.tracker.TrackerNames;
import org.argeo.tracker.TrackerService;
import org.argeo.tracker.core.TrackerUtils;
@@ -94,7 +95,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
@Override
public void forceRefresh(Object object) {
CmsUtils.clear(headerCmp);
- populateHeaderPart(headerCmp, NodeUtils.getUserHome(getSession()));
+ populateHeaderPart(headerCmp, NodeUtils.getUserHome(getHomeSession()));
CmsUtils.clear(taskListCmp);
populateTaskListCmp(taskListCmp);
@@ -104,7 +105,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
private void populateTaskListCmp(Composite parent) {
parent.setLayout(EclipseUiUtils.noSpaceGridLayout());
- NodeIterator nit = activitiesService.getMyTasks(getSession(), true);
+ NodeIterator nit = activitiesService.getMyTasks(getMainSession(), true);
if (!nit.hasNext()) {
Composite noTaskCmp = new Composite(parent, SWT.NO_FOCUS);
noTaskCmp.setLayoutData(EclipseUiUtils.fillAll());
@@ -121,7 +122,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
tvlc.setLayoutData(EclipseUiUtils.fillAll());
final TableViewer viewer = tvlc.getTableViewer();
viewer.setInput(JcrUtils.nodeIteratorToList(nit).toArray());
- final TaskViewerContextMenu contextMenu = new TaskViewerContextMenu(viewer, getSession(),
+ final TaskViewerContextMenu contextMenu = new TaskViewerContextMenu(viewer, getHomeSession(),
activitiesService) {
@Override
public boolean performAction(String actionId) {
@@ -190,7 +191,8 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
titleLbl.setLayoutData(gd);
final Link createTaskLk = new Link(leftCmp, SWT.CENTER);
- createTaskLk.setText("Create a task");
+ // createTaskLk.setText("Create a task");
+ createTaskLk.setText("" + SuiteMsg.newTodo.lead() + "");
gd = new GridData(SWT.BEGINNING, SWT.TOP, false, false);
// gd.verticalIndent = 5;
gd.horizontalIndent = 10;
@@ -204,13 +206,13 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
// String mainMixin = TrackerTypes.TRACKER_TASK;
String mainMixin = ActivitiesTypes.ACTIVITIES_TASK;
String pathCreated = ConnectWorkbenchUtils.createAndConfigureEntity(createTaskLk.getShell(),
- getSession(), getSystemAppService(), getSystemWorkbenchService(), mainMixin);
+ getHomeSession(), getSystemAppService(), getSystemWorkbenchService(), mainMixin);
if (EclipseUiUtils.notEmpty(pathCreated))
forceRefresh(null);
}
});
- NodeIterator nit = activitiesService.getMyTasks(getSession(), true);
+ NodeIterator nit = activitiesService.getMyTasks(getHomeSession(), true);
if (nit.hasNext()) {
List overdueTasks = new ArrayList<>();
while (nit.hasNext()) {
@@ -227,7 +229,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
}
if (trackerService != null) {
- nit = trackerService.getMyMilestones(getSession(), true);
+ nit = trackerService.getMyMilestones(getHomeSession(), true);
List openMilestones = new ArrayList<>();
if (nit.hasNext()) {
@@ -248,7 +250,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
}
// My projects
- List openProjects = JcrUtils.nodeIteratorToList(trackerService.getMyProjects(getSession(), true));
+ List openProjects = JcrUtils.nodeIteratorToList(trackerService.getMyProjects(getHomeSession(), true));
if (!openProjects.isEmpty()) {
Group myProjectsGp = new Group(rightCmp, SWT.NO_FOCUS);
myProjectsGp.setText("My open projects");