[elvystrac] r1826 - * final version of edit/delete/add elvys
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Tue, 23 Feb 2010 13:49:00 +0100
Author: JirkaM
Date: 2010-02-23 13:49:00 +0100 (Tue, 23 Feb 2010)
New Revision: 1826
Modified:
trunk/server/elvysCommons/src/elvys/server/bl/elvysrel/ElvysBLImpl.java
trunk/server/elvysCommons/src/elvys/server/bl/user/UserBLImpl.java
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/elvysrel/ElvysEditBean.java
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/messages_cs.properties
trunk/server/webServer2/WebContent/secured/elvysrel/editElvysForm.xhtml
trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml
Log:
* final version of edit/delete/add elvys
modified src/elvys/server/bl/elvysrel/ElvysBLImpl.java
modified src/elvys/server/bl/user/UserBLImpl.java
modified JavaSource/cz/elvys/webServer/beans/elvysrel/ElvysEditBean.java
modified JavaSource/cz/elvys/webServer/messages/messages_cs.properties
modified WebContent/secured/elvysrel/editElvysForm.xhtml
modified WebContent/secured/elvysrel/listOfElvyses.xhtml
Modified:
trunk/server/elvysCommons/src/elvys/server/bl/elvysrel/ElvysBLImpl.java
===================================================================
--- trunk/server/elvysCommons/src/elvys/server/bl/elvysrel/ElvysBLImpl.java
2010-02-23 12:27:31 UTC (rev 1825)
+++ trunk/server/elvysCommons/src/elvys/server/bl/elvysrel/ElvysBLImpl.java
2010-02-23 12:49:00 UTC (rev 1826)
@@ -330,16 +330,22 @@
}
elvys.setCompany(company);
- // set elvys_setting
- ElvysSetting es = new ElvysSetting();
- es.setNightMode(false);
+ ElvysSetting es = null;
+ ElvysGroup eg = null;
- elvys.setElvysSetting(es);
-
- // set elvys_group
- ElvysGroup eg = new ElvysGroup();
- eg.setName(elvys.getName()+"-group");
- elvys.setElvysGroup(eg);
+ // check, if elvys is new or is only update...
+ if(elvys.getId()==0){
+ // set elvys_setting
+ es = new ElvysSetting();
+ es.setNightMode(false);
+
+ elvys.setElvysSetting(es);
+
+ // set elvys_group
+ eg = new ElvysGroup();
+ eg.setName(elvys.getName()+"-group");
+ elvys.setElvysGroup(eg);
+ }
Session sess =
InitSessionFactory.getInstance().getCurrentSession();
@@ -350,8 +356,11 @@
throw new Error("error occured when initializing
hibernate session",e);
}
try {
- sess.saveOrUpdate(es);
- sess.saveOrUpdate(eg);
+ if(elvys.getId()==0){
+ sess.saveOrUpdate(es);
+ sess.saveOrUpdate(eg);
+ elvys.setId(es.getId());
+ }
sess.saveOrUpdate(elvys);
tx.commit();
} catch (Exception e) {
Modified: trunk/server/elvysCommons/src/elvys/server/bl/user/UserBLImpl.java
===================================================================
--- trunk/server/elvysCommons/src/elvys/server/bl/user/UserBLImpl.java
2010-02-23 12:27:31 UTC (rev 1825)
+++ trunk/server/elvysCommons/src/elvys/server/bl/user/UserBLImpl.java
2010-02-23 12:49:00 UTC (rev 1826)
@@ -114,7 +114,7 @@
// superadmin sees all users
query = sess.createQuery("from User as user " +
"inner join fetch user.role " +
- "inner join fetch user.company
WHERE user.disabled = 0 ORDER BY user.role.role,user.surname");
+ "inner join fetch user.company
WHERE user.disabled = 0 AND user.system = 0 ORDER BY
user.role.role,user.surname");
} else if (competency.equalsIgnoreCase("admin")) {
query = sess.createQuery("from User as user " +
"inner join fetch user.role " +
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/elvysrel/ElvysEditBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/elvysrel/ElvysEditBean.java
2010-02-23 12:27:31 UTC (rev 1825)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/elvysrel/ElvysEditBean.java
2010-02-23 12:49:00 UTC (rev 1826)
@@ -56,12 +56,13 @@
/**
* @return
*/
- public String prepareCreateElvysForm() {
+ public String prepareCreateElvysForm() {
selectedElvys = new Elvys();
companiesToSelect= loadPermittedCompanyList();
sizeOfCompaniesToSelect= companiesToSelect.size();
resolutionsToSelect = loadResolutionList();
sizeOfResolutionsToSelect = resolutionsToSelect.size();
+ resolutionsSelected = "";
return "editElvysForm";
}
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/messages_cs.properties
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/messages_cs.properties
2010-02-23 12:27:31 UTC (rev 1825)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/messages_cs.properties
2010-02-23 12:49:00 UTC (rev 1826)
@@ -4,6 +4,7 @@
user.form.loginAlreadyExists=Uveden\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no se
ji\u017e v datab\u00e1zi nach\u00e1z\u00ed, uve\u010fte pros\u00edm jin\u00e9
user.form.setCorrectEmail=Zadejte pros\u00edm email ve spr\u00e1vn\u00e9m
tvaru.
user.form.emptyPassword=Vypl\u0148te pros\u00edm heslo
+user.form.user.form.setCorrectEmail=Zadejte pros\u00edm email ve
spr\u00e1vn\u00e9m tvaru ( nap\u0159. jan.novak@xxxxxxxx )
login.lostPassword.UserNotExists=Litujeme, ale zasl\u00e1n\u00ed emailu se
nezda\u0159ilo, zkontrolujte pros\u00edm u\u017eivatelsk\u00e9 jm\u00e9no.
login.lostPassword.EmptyUsername=Vypl\u0148te pros\u00edm
u\u017eivatelsk\u00e9 jm\u00e9no
Modified:
trunk/server/webServer2/WebContent/secured/elvysrel/editElvysForm.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/elvysrel/editElvysForm.xhtml
2010-02-23 12:27:31 UTC (rev 1825)
+++ trunk/server/webServer2/WebContent/secured/elvysrel/editElvysForm.xhtml
2010-02-23 12:49:00 UTC (rev 1826)
@@ -53,7 +53,7 @@
<h:panelGroup>
<h:selectOneListbox
id="resolutionField" required="true"
value="#{elvysEditBean.resolutionsSelected}"
-
size="#{elvysEditBean.sizeOfResolutionsToSelect >=3? 3 :
elvysEditBean.sizeOfResolutionsToSelect}">
+
size="#{elvysEditBean.sizeOfResolutionsToSelect >=10? 10 :
elvysEditBean.sizeOfResolutionsToSelect}">
<f:selectItems
value="#{elvysEditBean.resolutionsToSelect}" />
</h:selectOneListbox>
<h:message
for="resolutionField" styleClass="error" />
Modified:
trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml
2010-02-23 12:27:31 UTC (rev 1825)
+++ trunk/server/webServer2/WebContent/secured/elvysrel/listOfElvyses.xhtml
2010-02-23 12:49:00 UTC (rev 1826)
@@ -189,8 +189,8 @@
<h:commandButton
id="EditElvysButton"
image="/images/icons/edit.png"
-
action="#{elvysEditBean.prepareCreateElvysForm}">
-
<f:setPropertyActionListener value="#{record.elvys}"
target="#{editElvysBean.selectedElvys}" />
+
action="#{elvysEditBean.prepareUpdateElvysForm}">
+
<f:setPropertyActionListener value="#{record.elvys}"
target="#{elvysEditBean.selectedElvys}" />
</h:commandButton>
<rich:toolTip
for="EditElvysButton" direction="bottom-left">
<h:outputText value="#{lbl['elvys.list.table.editelvys']}"/>
@@ -310,12 +310,12 @@
<a4j:commandButton
value="#{lbl['elvys.list.body.delete.tooltip.yes']}"
onclick="Richfaces.hideModalPanel('DeleteElvysModal')"
-
actionListener="#{elvysesBean.deleteUser}" reRender="listOfUsers">
+
actionListener="#{elvysesBean.deleteElvys}" reRender="ElvysesList">
</a4j:commandButton>
<a4j:commandButton
value="#{lbl['elvys.list.body.delete.tooltip.no']}"
onclick="Richfaces.hideModalPanel('DeleteUserModal')"
- reRender="listOfUsers" />
+ reRender="ElvysesList" />
</h:panelGrid>
</h:form></center>
</rich:modalPanel>
Other related posts:
- » [elvystrac] r1826 - * final version of edit/delete/add elvys - elvys
