diff options
| author | michael pereira | 2011-03-05 13:27:20 +0100 |
|---|---|---|
| committer | michael pereira | 2011-03-05 13:27:20 +0100 |
| commit | 3e86f2118ae8fd85e433913410c82915232cd073 (patch) | |
| tree | 3fbb90e62a1974cc9daf94d58a79f06ae449e0fd /.zfproject.xml | |
| parent | bootos v1 (diff) | |
| parent | Oberfläche der filter wurde verbessert, sodass nun filterentrys angelegt wer... (diff) | |
| download | pbs2-3e86f2118ae8fd85e433913410c82915232cd073.tar.gz pbs2-3e86f2118ae8fd85e433913410c82915232cd073.tar.xz pbs2-3e86f2118ae8fd85e433913410c82915232cd073.zip | |
.zfproject fix
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Conflicts:
.zfproject.xml
Diffstat (limited to '.zfproject.xml')
| -rw-r--r-- | .zfproject.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.zfproject.xml b/.zfproject.xml index 3927d78..cfbefcf 100644 --- a/.zfproject.xml +++ b/.zfproject.xml @@ -28,6 +28,7 @@ <actionMethod actionName="addfilter"/> <actionMethod actionName="removefilter"/> <actionMethod actionName="editfilter"/> + <actionMethod actionName="addfilterentry"/> </controllerFile> <controllerFile controllerName="Bootos"> <actionMethod actionName="index"/> @@ -47,6 +48,8 @@ <formFile formName="BootosDelete"/> <formFile formName="BootosEdit"/> <formFile formName="BootosIndex"/> + <formFile formName="FilterEdit"/> + <formFile formName="FilterEntriesAdd"/> </formsDirectory> <layoutsDirectory enabled="false"/> <modelsDirectory> @@ -175,6 +178,8 @@ </viewControllerScriptsDirectory> <viewControllerScriptsDirectory forControllerName="Bootos"> <viewScriptFile forActionName="deletebootos"/> + <viewControllerScriptsDirectory forControllerName="Filter"> + <viewScriptFile forActionName="addfilterentry"/> </viewControllerScriptsDirectory> </viewScriptsDirectory> <viewHelpersDirectory/> |