Author: sebawagner
Date: Sun Aug 11 02:56:07 2013
New Revision: 1512857
URL: http://svn.apache.org/r1512857
Log:
OPENMEETINGS-758 Remove organisation admin Flash UI and Server Side related API
Removed:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/orgadmin/
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/OrganisationService.java
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/WEB-INF/openmeetings-applicationContext.xml
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/OrganisationManager.java
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/UserManager.java
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1512857&r1=1512856&r2=1512857&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
openmeetings/branches/OPENMEETINGS-745/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sun Aug 11 02:56:07 2013
@@ -80,7 +80,6 @@
<bean id="xmlcrm.service"
class="org.apache.openmeetings.remote.MainService" />
<bean id="printservice.service"
class="org.apache.openmeetings.remote.PrintService" />
<bean id="pollservice.service"
class="org.apache.openmeetings.remote.PollService" />
- <bean id="organisationservice.service"
class="org.apache.openmeetings.remote.OrganisationService" />
<bean id="meetingmemberservice.service"
class="org.apache.openmeetings.remote.MeetingMemberService" />
<bean id="languageservice.service"
class="org.apache.openmeetings.remote.LanguageService" />
<bean id="invitationservice.service"
class="org.apache.openmeetings.remote.InvitationService" />
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx?rev=1512857&r1=1512856&r2=1512857&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
(original)
+++
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
Sun Aug 11 02:56:07 2013
@@ -24,7 +24,6 @@
<!-- admin modules -->
<!-- -->
<include href="useradmin/" />
- <include href="orgadmin/" />
<include href="roomadmin/" />
<!-- -->
<include href="servers/" />
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/OrganisationManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/OrganisationManager.java?rev=1512857&r1=1512856&r2=1512857&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/OrganisationManager.java
(original)
+++
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/OrganisationManager.java
Sun Aug 11 02:56:07 2013
@@ -73,26 +73,6 @@ public class OrganisationManager {
private AuthLevelUtil authLevelUtil;
/**
- * adds a new organisation if userlevel is admin
- *
- * @param user_level
- * @param orgname
- * @param user_id
- * @return
- */
- public Long addOrganisation(Long user_level, String orgname, long
user_id) {
- try {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- Long orgId = this.addOrganisation(orgname,
user_id);
- return orgId;
- }
- } catch (Exception err) {
- log.error("addOrganisation", err);
- }
- return null;
- }
-
- /**
* adds a new organisation to the table organisation
*
* @param titelname
@@ -127,63 +107,6 @@ public class OrganisationManager {
return null;
}
- /**
- *
- * @param user_level
- * @param start
- * @param max
- * @param orderby
- * @return
- */
- public SearchResult<Organisation> getOrganisations(long user_level, int
start, int max,
- String orderby, boolean asc) {
- try {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- SearchResult<Organisation> sresult = new
SearchResult<Organisation>();
-
sresult.setObjectName(Organisation.class.getName());
- sresult.setRecords(orgDao.count());
- sresult.setResult(this.getOrganisations(start,
max, orderby,
- asc));
- return sresult;
- } else {
- log.error("[getOrganisations] noPremission");
- }
- } catch (Exception ex2) {
- log.error("[getOrganisations]", ex2);
- }
- return null;
- }
-
- /**
- *
- * @param user_level
- * @return
- */
- public List<Organisation> getOrganisations(int start, int max,
- String orderby, boolean asc) {
- try {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<Organisation> cq =
cb.createQuery(Organisation.class);
- Root<Organisation> c = cq.from(Organisation.class);
- Predicate condition = cb.equal(c.get("deleted"), false);
- cq.where(condition);
- cq.distinct(asc);
- if (asc) {
- cq.orderBy(cb.asc(c.get(orderby)));
- } else {
- cq.orderBy(cb.desc(c.get(orderby)));
- }
- TypedQuery<Organisation> q = em.createQuery(cq);
- q.setFirstResult(start);
- q.setMaxResults(max);
- List<Organisation> ll = q.getResultList();
- return ll;
- } catch (Exception ex2) {
- log.error("[getOrganisations]", ex2);
- }
- return null;
- }
-
public List<Organisation> getOrganisations(Long user_level) {
try {
if (authLevelUtil.checkAdminLevel(user_level)) {
@@ -206,33 +129,6 @@ public class OrganisationManager {
}
/**
- * updates an organisation if user_level is admin
- *
- * @param user_level
- * @param organisation_id
- * @param orgname
- * @param users_id
- * @return
- */
- public Long updateOrganisation(Long user_level, long organisation_id,
- String orgname, long users_id) {
- try {
-
- Organisation org = orgDao.get(organisation_id);
- org.setName(orgname);
- org.setUpdatedby(users_id);
- org.setUpdatetime(new Date());
-
- em.merge(org);
-
- return org.getOrganisation_id();
- } catch (Exception err) {
- log.error("updateOrganisation", err);
- }
- return null;
- }
-
- /**
* checks if a user is already stored
*
* @param userIdToAdd
@@ -330,27 +226,6 @@ public class OrganisationManager {
}
/**
- * get an organisation by id and only as admin
- *
- * @param user_level
- * @param organisation_id
- * @return
- */
- public Organisation getOrganisationById(long user_level,
- long organisation_id) {
- try {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- return orgDao.get(organisation_id);
- } else {
- log.error("[getOrganisationById] authorization
required");
- }
- } catch (Exception ex2) {
- log.error("[getOrganisationById]", ex2);
- }
- return null;
- }
-
- /**
* Gets an organisation by its id
*
* @param organisation_id
@@ -381,33 +256,6 @@ public class OrganisationManager {
return getOrganisationByIdBackup(organisation_id);
}
- public Long deleteOrganisation(long user_level, long organisation_id,
- long updatedby) {
- try {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- return this.deleteOrganisation(organisation_id,
updatedby);
- }
- } catch (Exception ex2) {
- log.error("[deleteOrganisation]", ex2);
- }
- return null;
- }
-
- /**
- *
- * @param organisation_id
- * @param updatedby
- * @return
- */
- public Long deleteOrganisation(long organisation_id, long updatedby) {
- try {
- orgDao.delete(orgDao.get(organisation_id), updatedby);
- } catch (Exception ex2) {
- log.error("[deleteOrganisation]", ex2);
- }
- return organisation_id;
- }
-
/**
* Adds a user to a given organisation-unit
*
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/UserManager.java?rev=1512857&r1=1512856&r2=1512857&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/UserManager.java
(original)
+++
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/UserManager.java
Sun Aug 11 02:56:07 2013
@@ -37,8 +37,6 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -354,45 +352,6 @@ public class UserManager {
}
}
- /**
- * suche eines Bentzers
- *
- * @param user_level
- * @param searchstring
- * @param max
- * @param start
- * @return
- */
- public List<User> searchUser(long user_level, String searchcriteria,
- String searchstring, int max, int start, String
orderby, boolean asc) {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- try {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<User> cq =
cb.createQuery(User.class);
- Root<User> c = cq.from(User.class);
- Expression<String> literal = cb.literal("%" +
searchstring + "%");
- Path<String> path = c.get(searchcriteria);
- Predicate predicate = cb.like(path, literal);
- Predicate condition =
cb.notEqual(c.get("deleted"), true);
- cq.where(condition, predicate);
- cq.distinct(asc);
- if (asc) {
- cq.orderBy(cb.asc(c.get(orderby)));
- } else {
- cq.orderBy(cb.desc(c.get(orderby)));
- }
- TypedQuery<User> q = em.createQuery(cq);
- q.setFirstResult(start);
- q.setMaxResults(max);
- List<User> contactsZ = q.getResultList();
- return contactsZ;
- } catch (Exception ex2) {
- log.error("searchUser", ex2);
- }
- }
- return null;
- }
-
public List<Userdata> getUserdataDashBoard(Long user_id) {
if (user_id.longValue() > 0) {
try {
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java?rev=1512857&r1=1512856&r2=1512857&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
(original)
+++
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
Sun Aug 11 02:56:07 2013
@@ -216,27 +216,6 @@ public class UserService {
}
/**
- *
- * @param SID
- * @param searchcriteria
- * login,lastname,firstname,user_id
- * @param searchstring
- * @param max
- * @param start
- * @param orderby
- * login,lastname,firstname,user_id
- * @param asc
- * @return List of the users found
- */
- public List<User> searchUser(String SID, String searchcriteria,
- String searchstring, int max, int start, String
orderby, boolean asc) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- return userManager.searchUser(user_level, searchcriteria,
- searchstring, max, start, orderby, asc);
- }
-
- /**
* get a list of all users of an organisation
*
* @param SID
