Merge with 597eb7362fc0b9482695a25991f528218ae699b3

diff --git a/database/initializeSharedFlag.sql b/database/initializeSharedFlag.sql
new file mode 100644 (file)
index 0000000..24c32e3
--- /dev/null
+++ b/database/initializeSharedFlag.sql
@@ -0,0 +1,20 @@
+update fileheader 
+set shared=true
+where id in (
+select fileheader_id
+from fileheader_permission
+group by fileheader_id
+having count(permissions_id)>1
+)
+or readforall=true;
+
+
+update folder 
+set shared=true
+where id in (
+select folder_id
+from folder_permission
+group by folder_id
+having count(permissions_id)>1
+)
+or readforall=true;

diff --git a/src/gr/ebs/gss/admin/client/AdminService.java b/src/gr/ebs/gss/admin/client/AdminService.java
index e1e6440..c951df2 100644 (file)
--- a/src/gr/ebs/gss/admin/client/AdminService.java
+++ b/src/gr/ebs/gss/admin/client/AdminService.java
@@ -56,5 +56,4 @@ public interface AdminService extends RemoteService {
 
        void removeUser(Long userId) throws RpcException,ObjectNotFoundException,InsufficientPermissionsException;
        
-       void fixSharedFlagForAllFoldersAndFiles() throws RpcException;
 }

diff --git a/src/gr/ebs/gss/admin/client/AdminServiceAsync.java b/src/gr/ebs/gss/admin/client/AdminServiceAsync.java
index fb3b26f..d4b8306 100644 (file)
--- a/src/gr/ebs/gss/admin/client/AdminServiceAsync.java
+++ b/src/gr/ebs/gss/admin/client/AdminServiceAsync.java
@@ -50,6 +50,5 @@ public interface AdminServiceAsync {
        void removeUserClass(UserClassDTO userClass, AsyncCallback<Void> callback);
 
        void removeUser(Long userId, AsyncCallback<Void> callback);
-       
-       void fixSharedFlagForAllFoldersAndFiles( AsyncCallback<Void> callback);
+
 }

diff --git a/src/gr/ebs/gss/admin/client/ui/OperationsPanel.java b/src/gr/ebs/gss/admin/client/ui/OperationsPanel.java
index ed01e11..e30de4f 100644 (file)
--- a/src/gr/ebs/gss/admin/client/ui/OperationsPanel.java
+++ b/src/gr/ebs/gss/admin/client/ui/OperationsPanel.java
@@ -18,34 +18,11 @@
  */
 package gr.ebs.gss.admin.client.ui;
 
-import gr.ebs.gss.admin.client.TwoAdmin;
-import gr.ebs.gss.admin.client.ui.FilesPanel.UserPanelUiBinder;
-import gr.ebs.gss.server.domain.dto.FileBodyDTO;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
-import gr.ebs.gss.server.domain.dto.PermissionDTO;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.KeyPressEvent;
-import com.google.gwt.event.dom.client.KeyPressHandler;
-import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
-import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.uibinder.client.UiHandler;
-import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.DeferredCommand;
-import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.Grid;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
 
 
@@ -64,7 +41,7 @@ public class OperationsPanel extends Composite {
 
 
        
-       @UiField Button fixButton;
+       //@UiField Button fixButton;
        
        public OperationsPanel() {
                
@@ -74,7 +51,7 @@ public class OperationsPanel extends Composite {
 
        }
 
-       @UiHandler("fixButton")
+       /*@UiHandler("fixButton")
        void handleClick(@SuppressWarnings("unused") ClickEvent e){
                DeferredCommand.addCommand(new Command() {
 
@@ -99,7 +76,7 @@ public class OperationsPanel extends Composite {
 
                        }
                });
-       }
+       }*/
 
 
 

diff --git a/src/gr/ebs/gss/admin/client/ui/OperationsPanel.ui.xml b/src/gr/ebs/gss/admin/client/ui/OperationsPanel.ui.xml
index 02936b5..a34cfbb 100644 (file)
--- a/src/gr/ebs/gss/admin/client/ui/OperationsPanel.ui.xml
+++ b/src/gr/ebs/gss/admin/client/ui/OperationsPanel.ui.xml
@@ -13,7 +13,7 @@
                                <h3>Administrative Operations</h3>
                        </div>
                </g:HTMLPanel>
-               <g:HorizontalPanel spacing="3">
+               <!--  g:HorizontalPanel spacing="3">
                        <g:cell horizontalAlignment="ALIGN_CENTER" verticalAlignment="ALIGN_MIDDLE">
                                <g:HTML>Fix Sharing flag:</g:HTML>
                        </g:cell>
@@ -22,7 +22,7 @@
                                <g:Button ui:field="fixButton">Search</g:Button>
                        </g:cell>
                        
-               </g:HorizontalPanel>
+               </g:HorizontalPanel -->
 
 
                

diff --git a/src/gr/ebs/gss/server/admin/AdminServiceImpl.java b/src/gr/ebs/gss/server/admin/AdminServiceImpl.java
index 8b52797..42046d1 100644 (file)
--- a/src/gr/ebs/gss/server/admin/AdminServiceImpl.java
+++ b/src/gr/ebs/gss/server/admin/AdminServiceImpl.java
@@ -173,8 +173,4 @@ public class AdminServiceImpl extends RemoteServiceServlet implements AdminServi
 
        }
 
-       @Override
-       public void fixSharedFlagForAllFoldersAndFiles() throws RpcException {
-               getService().fixSharedFlagForAllFoldersAndFiles();              
-       }
 }

diff --git a/src/gr/ebs/gss/server/ejb/AdminAPI.java b/src/gr/ebs/gss/server/ejb/AdminAPI.java
index 68d6d5f..1bb3142 100644 (file)
--- a/src/gr/ebs/gss/server/ejb/AdminAPI.java
+++ b/src/gr/ebs/gss/server/ejb/AdminAPI.java
@@ -80,9 +80,4 @@ public interface AdminAPI {
 
        public void removeUser(Long userId) throws ObjectNotFoundException, InsufficientPermissionsException;
 
-       /**
-        * 
-        */
-       void fixSharedFlagForAllFoldersAndFiles();
-
 }

diff --git a/src/gr/ebs/gss/server/ejb/AdminAPIBean.java b/src/gr/ebs/gss/server/ejb/AdminAPIBean.java
index 0bd1a80..538931d 100644 (file)
--- a/src/gr/ebs/gss/server/ejb/AdminAPIBean.java
+++ b/src/gr/ebs/gss/server/ejb/AdminAPIBean.java
@@ -539,8 +539,5 @@ public class AdminAPIBean implements AdminAPI {
                        }
                }
        }
-       @Override
-       public void fixSharedFlagForAllFoldersAndFiles(){
-               dao.fixSharedFlagForAllFoldersAndFiles();
-       }
+
 }

diff --git a/src/gr/ebs/gss/server/ejb/GSSDAO.java b/src/gr/ebs/gss/server/ejb/GSSDAO.java
index 77804de..73fd152 100644 (file)
--- a/src/gr/ebs/gss/server/ejb/GSSDAO.java
+++ b/src/gr/ebs/gss/server/ejb/GSSDAO.java
@@ -513,9 +513,4 @@ public interface GSSDAO {
         */
        public List<UserLogin> getLoginsForUser (Long userId);
 
-       /**
-        * 
-        */
-       void fixSharedFlagForAllFoldersAndFiles();
-
 }

diff --git a/src/gr/ebs/gss/server/ejb/GSSDAOBean.java b/src/gr/ebs/gss/server/ejb/GSSDAOBean.java
index b16cd3b..ed1cb63 100644 (file)
--- a/src/gr/ebs/gss/server/ejb/GSSDAOBean.java
+++ b/src/gr/ebs/gss/server/ejb/GSSDAOBean.java
@@ -778,21 +778,4 @@ public class GSSDAOBean implements GSSDAO {
                return res;                                                                     
        }
 
-       @Override
-       public void fixSharedFlagForAllFoldersAndFiles(){
-               List<Folder> folders = manager.createQuery("select f from Folder f").getResultList();
-               for(Folder f : folders){
-                       if(f.isReadForAll()||f.getPermissions().size()>1){
-                               f.setShared(true);
-                               update(f);
-                       }
-               }
-               List<FileHeader> files = manager.createQuery("select f from FileHeader f").getResultList();
-               for(FileHeader f : files){
-                       if(f.isReadForAll()||f.getPermissions().size()>1){
-                               f.setShared(true);
-                               update(f);
-                       }
-               }
-       }
 }