IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Browse Source 
Conflicts:
	src/main/java/info/bukova/isspst/data/Requirement.java
This commit is contained in:
František Přibyl
2014-07-16 10:42:12 +02:00
parent 0cd4e039f8 eade2dd793
commit 0041a1744b
33 changed files with 1518 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/locales/zk-label.properties
+11
View File
@@ -16,11 +16,22 @@ RequirementsFormReqDate=Datum požadavku
RequirementsFormCenter=Středisko
RequirementsFormDescription=Popis
RequirementsFormDeliveryDate=Datum dodání
RequirementsFormFrom=Z
RequirementsFormTo=Do
RequirementsFormPurpose=Účel cesty
RequirementsGridNumberSerie=Číslo
RequirementsGridReqDate=Datum požadavku
RequirementsGridCenter=Středisko
RequirementsGridDescription=Popis
RequirementsGridDeliveryDate=Datum dodání
RequirementsGridFrom=Z
RequirementsGridTo=Do
RequirementsGridWorkgroup=Komise
RequirementsGridOwnedBy=Vytvořil
RequirementsGridMy=Moje
RequirementsGridMyCentres=Má střediska
RequirementsGridMyWorkgroups=Mé komise
RequirementsGridAll=Vše
RequirementItemCode=Kód
RequirementItemName=Text
src/main/webapp/WEB-INF/spring/mail-services.xml
+46 -46
View File
@@ -1,46 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
<property name="host" value="${mail.host}"/>
<property name="port" value="${mail.port}"/>
<property name="username" value="${mail.username}"/>
<property name="password" value="${mail.password}"/>
<property name="defaultEncoding" value="UTF-8"/>
<property name="javaMailProperties">
<props>
<prop key="mail.smtp.auth">${mail.useauth}</prop>
<prop key="mail.smtp.starttls.enable">${mail.usessl}</prop>
</props>
</property>
</bean>
<bean id="mailer" class="info.bukova.isspst.mail.MailerWithAttachement">
<constructor-arg ref="mailSender"/>
<property name="from" value="${mail.from}"/>
</bean>
<bean id="simpleMailer" class="info.bukova.isspst.mail.SimpleMailer">
<constructor-arg ref="mailSender"/>
<property name="from" value="${mail.from}"/>
</bean>
<bean id="messageBuilder" class="info.bukova.isspst.mail.EntityMessageBuilder"/>
<!-- <bean id="mailer" class="info.bukova.rsfaktura.services.mail.ThreadMailer"> -->
<!-- <constructor-arg ref="attachementMailer"/> -->
<!-- </bean> -->
<!-- <bean id="attachementMailer" class="info.bukova.rsfaktura.services.mail.AttachementMailer"> -->
<!-- <constructor-arg ref="tmpStorage"/> -->
<!-- <property name="from" value="josef.rokos@gmail.com"/> -->
<!-- <property name="sender" ref="mailSender"/> -->
<!-- </bean> -->
<!-- <bean id="messageBuilder" class="info.bukova.rsfaktura.services.mail.MailMessageBuilder"> -->
<!-- <constructor-arg ref="tmpStorage"/> -->
<!-- </bean> -->
</beans>
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
<property name="host" value="${mail.host}"/>
<property name="port" value="${mail.port}"/>
<property name="username" value="${mail.username}"/>
<property name="password" value="${mail.password}"/>
<property name="defaultEncoding" value="UTF-8"/>
<property name="javaMailProperties">
<props>
<prop key="mail.smtp.auth">${mail.useauth}</prop>
<prop key="mail.smtp.starttls.enable">${mail.usessl}</prop>
</props>
</property>
</bean>
<bean id="mailer" class="info.bukova.isspst.mail.MailerWithAttachement">
<constructor-arg ref="mailSender"/>
<property name="from" value="${mail.from}"/>
</bean>
<bean id="simpleMailer" class="info.bukova.isspst.mail.SimpleMailer">
<constructor-arg ref="mailSender"/>
<property name="from" value="${mail.from}"/>
</bean>
<bean id="messageBuilder" class="info.bukova.isspst.mail.EntityMessageBuilder"/>
<!-- <bean id="mailer" class="info.bukova.rsfaktura.services.mail.ThreadMailer"> -->
<!-- <constructor-arg ref="attachementMailer"/> -->
<!-- </bean> -->
<!-- <bean id="attachementMailer" class="info.bukova.rsfaktura.services.mail.AttachementMailer"> -->
<!-- <constructor-arg ref="tmpStorage"/> -->
<!-- <property name="from" value="josef.rokos@gmail.com"/> -->
<!-- <property name="sender" ref="mailSender"/> -->
<!-- </bean> -->
<!-- <bean id="messageBuilder" class="info.bukova.rsfaktura.services.mail.MailMessageBuilder"> -->
<!-- <constructor-arg ref="tmpStorage"/> -->
<!-- </bean> -->
</beans>
src/main/webapp/WEB-INF/spring/root-context.xml
+17 -1
View File
@@ -70,7 +70,9 @@
<property name="permissionEvaluator" ref="permissionEvaluator" />
</bean>
<bean id="permissionEvaluator" class="info.bukova.isspst.security.IsspstPermissionEvaluator"/>
<bean id="permissionEvaluator" class="info.bukova.isspst.security.IsspstPermissionEvaluator">
<property name="workgroupService" ref="workgroupServiceNoTx"/>
</bean>
<security:http auto-config="true" use-expressions="true">
<security:intercept-url pattern="/app/**" access="hasAnyRole('ROLE_USER', 'ROLE_ADMIN')"/>
@@ -161,6 +163,10 @@
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<bean id="tripReqDao" class="info.bukova.isspst.dao.jpa.TripRequirementDaoJPA">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<!-- Business logic -->
<bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
@@ -223,6 +229,10 @@
<property name="validator" ref="validator"/>
</bean>
<bean id="workgroupServiceNoTx" class="info.bukova.isspst.services.workgroups.WorkgroupServiceImpl">
<property name="dao" ref="commissionDao"/>
</bean>
<bean id="reqTypeService" class="info.bukova.isspst.services.requirement.RequirementTypeServiceImpl">
<property name="dao" ref="reqTypeDao"/>
<property name="validator" ref="validator"/>
@@ -266,4 +276,10 @@
<property name="xmlContext" ref="xmlCtxSettings" />
</bean>
<bean id="tripRequirementService" class="info.bukova.isspst.services.requirement.TripRequirementServiceImpl">
<property name="dao" ref="tripReqDao"/>
<property name="validator" ref="validator"/>
<property name="numberSeriesService" ref="numericSeriesService"/>
</bean>
</beans>