RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move classes and settings.zul to new package

Browse source 
FEA: ItEr75S07UserSettings
This commit is contained in:
Cristina Alvarino 2011-06-30 13:46:05 +02:00 • committed by Manuel Rego Casasnovas
parent f39394b955
commit c9cb970436
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
View file

@ -340,7 +340,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
subItem(_("Materials Needs At Date"),"/reports/timeLineMaterialReport.zul","15-informes.html")); subItem(_("Materials Needs At Date"),"/reports/timeLineMaterialReport.zul","15-informes.html"));
topItem(_("My account"), "", "", topItem(_("My account"), "", "",
subItem(_("Settings"), "/users/settings.zul", "")); subItem(_("Settings"), "/settings/settings.zul", ""));
} }
private Vbox getRegisteredItemsInsertionPoint() { private Vbox getRegisteredItemsInsertionPoint() {

2
navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java → navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
View file

@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.navalplanner.web.users; package org.navalplanner.web.users.settings;
import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.users.entities.Language; import org.navalplanner.business.users.entities.Language;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java → navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
View file

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.navalplanner.web.users; package org.navalplanner.web.users.settings;
import static org.navalplanner.web.I18nHelper._; import static org.navalplanner.web.I18nHelper._;

4
navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java → navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
View file

@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.navalplanner.web.users; package org.navalplanner.web.users.settings;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.common.exceptions.ValidationException;
@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
*/ */
@Service @Service
@Scope(BeanDefinition.SCOPE_PROTOTYPE) @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@OnConcurrentModification(goToPage = "/users/settings.zul") @OnConcurrentModification(goToPage = "/settings/settings.zul")
public class SettingsModel implements ISettingsModel { public class SettingsModel implements ISettingsModel {
@Autowired @Autowired

2
navalplanner-webapp/src/main/webapp/users/settings.zul → navalplanner-webapp/src/main/webapp/settings/settings.zul
View file

@ -29,7 +29,7 @@
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?> <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<zk> <zk>
<window id="settingsWindow" self="@{define(content)}" <window id="settingsWindow" self="@{define(content)}"
apply="org.navalplanner.web.users.SettingsController" apply="org.navalplanner.web.users.settings.SettingsController"
title="${i18n:_('User settings')}"> title="${i18n:_('User settings')}">
<vbox id="messagesContainer" /> <vbox id="messagesContainer" />