summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorStephan Schwaer2015-09-25 14:56:17 +0200
committerStephan Schwaer2015-09-25 14:56:17 +0200
commit6c41e36c0e36df4972da797ee8da5a4e9ddabcb6 (patch)
treef5c99c947e9711d331803eafdd1b39e0236444a4 /dozentenmodul/src/main/java
parent[client] Now correctly scale user list with number of users. (diff)
downloadtutor-module-6c41e36c0e36df4972da797ee8da5a4e9ddabcb6.tar.gz
tutor-module-6c41e36c0e36df4972da797ee8da5a4e9ddabcb6.tar.xz
tutor-module-6c41e36c0e36df4972da797ee8da5a4e9ddabcb6.zip
[client] Moved default permissions onto same page as custom permissions for image wizard.
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java48
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java22
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java4
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java6
4 files changed, 52 insertions, 28 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
index d15ca603..b33dee32 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
@@ -1,5 +1,13 @@
package org.openslx.dozmod.gui.wizard.layout;
+import java.awt.Font;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
import org.openslx.dozmod.gui.control.ImageCustomPermissionManager;
import org.openslx.dozmod.gui.helper.GridManager;
import org.openslx.dozmod.gui.wizard.Wizard;
@@ -10,6 +18,12 @@ public class ImageCustomPermissionPageLayout extends WizardPage {
protected ImageCustomPermissionManager imageCustomPermissionManager;
+ // permissions checks
+ protected JCheckBox readPermissionsCheck;
+ protected JCheckBox writePermissionsCheck;
+ protected JCheckBox linkPermissionsCheck;
+ protected JCheckBox adminPermissionsCheck;
+
/**
* wizard page for setting custom permissions
*
@@ -17,12 +31,42 @@ public class ImageCustomPermissionPageLayout extends WizardPage {
*/
public ImageCustomPermissionPageLayout(Wizard wizard) {
super(wizard, "Benutzerspezifische Rechte festlegen");
- setDescription("Legen Sie hier benutzerspezifische Berechtigungen fest, falls gewünscht.");
+ setDescription("Legen Sie hier die gewünschten Berechtigungen fest.");
GridManager grid = new GridManager(this, 1, false);
+ // custom permissions
imageCustomPermissionManager = new ImageCustomPermissionManager();
grid.add(imageCustomPermissionManager).fill(true, true).expand(true, true);
grid.nextRow();
- grid.finish(true);
+
+ // -- default permissions --
+ JLabel defaultPermLabel = new JLabel("Standardberechtigungen");
+ defaultPermLabel.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0));
+ defaultPermLabel.setFont(defaultPermLabel.getFont().deriveFont(Font.BOLD));
+ grid.add(defaultPermLabel);
+
+ JLabel defaultDescriptionLabel = new JLabel("<html><body style ='width:100%'> "
+ + "Legen Sie hier die Berechtigungen für alle anderen (nicht in der Liste "
+ + "angezeigten) Benutzer fest.</body></html>");
+ defaultDescriptionLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+ grid.add(defaultDescriptionLabel).fill(true, false).expand(true, false);
+
+ JPanel permissionsPanel = new JPanel();
+ permissionsPanel.setLayout(new BoxLayout(permissionsPanel, BoxLayout.LINE_AXIS));
+ linkPermissionsCheck = new JCheckBox("Verlinken");
+ linkPermissionsCheck.setSelected(true);
+ readPermissionsCheck = new JCheckBox("Herunterladen");
+ readPermissionsCheck.setSelected(true);
+ writePermissionsCheck = new JCheckBox("Bearbeiten");
+ adminPermissionsCheck = new JCheckBox("Administrieren");
+ permissionsPanel.add(linkPermissionsCheck);
+ permissionsPanel.add(readPermissionsCheck);
+ permissionsPanel.add(writePermissionsCheck);
+ permissionsPanel.add(adminPermissionsCheck);
+ permissionsPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 0));
+ grid.add(permissionsPanel).fill(true, false).expand(true, false);
+
+ grid.nextRow();
+ grid.finish(false);
}
}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
index e0f663a8..aa84ec48 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
@@ -26,11 +26,6 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
protected JCheckBox setActiveCheck;
protected JCheckBox isTemplateCheck;
- // permissions checks
- protected JCheckBox readPermissionsCheck;
- protected JCheckBox writePermissionsCheck;
- protected JCheckBox linkPermissionsCheck;
- protected JCheckBox adminPermissionsCheck;
/**
* wizard page for entering image data at creating or editing an image
@@ -76,22 +71,7 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
grid.add(licencedSoftwareCheck);
grid.nextRow();
- // -- default permissions group --
- JPanel permissionsGroup = new JPanel();
- permissionsGroup.setBorder(new TitledBorder("Standartberechtigungen"));
- // TODO info text about what these perms do (e.g. diff between edit/admin)
- linkPermissionsCheck = new JCheckBox("Verlinken");
- linkPermissionsCheck.setSelected(true);
- readPermissionsCheck = new JCheckBox("Herunterladen");
- readPermissionsCheck.setSelected(true);
- writePermissionsCheck = new JCheckBox("Bearbeiten");
- adminPermissionsCheck = new JCheckBox("Administrieren");
- permissionsGroup.add(linkPermissionsCheck);
- permissionsGroup.add(readPermissionsCheck);
- permissionsGroup.add(writePermissionsCheck);
- permissionsGroup.add(adminPermissionsCheck);
- grid.add(permissionsGroup, 2, 1).fill(true, false).expand(true, false);
- grid.nextRow();
+
// -- end permissions group --
isTemplateCheck = new JCheckBox("Vorlage erstellen");
grid.add(isTemplateCheck, 2);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
index d3a165c6..f0e586d0 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
@@ -40,6 +40,10 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
@Override
protected void onPageLeave() {
LOGGER.debug("Saving permissions to state ...");
+ // saving the default permissions
+ state.defaultPermissions = new ImagePermissions(linkPermissionsCheck.isSelected(),
+ readPermissionsCheck.isSelected(), writePermissionsCheck.isSelected(),
+ adminPermissionsCheck.isSelected());
// save the table stuff to our upload wizard state
Map<String, ImagePermissions> newPermissionMap= imageCustomPermissionManager.updatePermissionReferences();
if (newPermissionMap == null || newPermissionMap.isEmpty())
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index d97e6da8..17d3798d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -8,7 +8,6 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.apache.log4j.Logger;
-import org.openslx.bwlp.thrift.iface.ImagePermissions;
import org.openslx.bwlp.thrift.iface.OperatingSystem;
import org.openslx.bwlp.thrift.iface.ShareMode;
import org.openslx.dozmod.gui.Gui;
@@ -98,9 +97,6 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
@Override
protected boolean wantNextOrFinish() {
- state.defaultPermissions = new ImagePermissions(linkPermissionsCheck.isSelected(),
- readPermissionsCheck.isSelected(), writePermissionsCheck.isSelected(),
- adminPermissionsCheck.isSelected());
state.selectedOs = (OperatingSystem)osCombo.getSelectedItem();
state.isEnabled = setActiveCheck.isSelected();
state.isTemplate = isTemplateCheck.isSelected();
@@ -137,7 +133,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
setPageComplete(false);
return;
}
- setDescription("Klicken Sie auf 'Weiter' für benutzerspezifische Berechtigungen oder 'Fertigstellen'");
+ setDescription("Klicken Sie auf 'Weiter' um Berechtigungen festzulegen oder 'Fertigstellen'");
setPageComplete(true);
}
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-03-01 16:07:19 +0100