diff options
| author | Nino Breuer | 2014-12-01 16:30:59 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-12-01 16:30:59 +0100 |
| commit | 6a90495ac046d90a749ec2ec152ffdf4d7d603f0 (patch) | |
| tree | 625e5d14802ad1d3d847ab1895edd85a48167e95 /dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java | |
| parent | • changed implementation of user authentication. (diff) | |
| parent | • Admin can download any image (diff) | |
| download | tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.tar.gz tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.tar.xz tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
möp. großes geschrei, fehler bitte an mich.
dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
dozentenmodulserver/src/main/java/server/ServerHandler.java
dozentenmodulserver/src/main/java/server/generated/Server.java
dozentenmodulserver/thrift/server.thrift
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index 1b5feb6e..5e1607a8 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -140,6 +140,7 @@ public class SearchEditImage_GUI extends JFrame { RowFilter rf = null; List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2); + private JLabel lblTotalResults; /** @@ -213,7 +214,7 @@ public class SearchEditImage_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite - Image bearbeiten"); + setTitle("bwLehrpool Suite - Image bearbeiten - "+person.verantwortlicher.getUserID()); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 918, 722); setLocationRelativeTo(formerGUI); @@ -483,6 +484,10 @@ public class SearchEditImage_GUI extends JFrame { scrollPaneMyImage.setViewportView(tablemyImages); + + lblTotalResults = new JLabel("Anzahl:"); + lblTotalResults.setBounds(10, 512, 131, 20); + contentPanel.add(lblTotalResults); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 902, 33); @@ -760,7 +765,7 @@ public class SearchEditImage_GUI extends JFrame { // Hole eine Liste der passenden Images, if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - images = client.getImageList(person.verantwortlicher.getUserID()); + images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); } else { //only get permitted list images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); @@ -795,7 +800,8 @@ public class SearchEditImage_GUI extends JFrame { x++; i.next(); } - //LOGGER.info("Finished counting crap, mo"+model.getRowCount()); + //show number if rows in GUI + lblTotalResults.setText(lblTotalResults.getText()+" "+model.getRowCount()); return model; } catch (TException | ParseException e1) { |