diff options
| author | michael pereira | 2011-03-04 03:21:32 +0100 |
|---|---|---|
| committer | michael pereira | 2011-03-04 03:21:32 +0100 |
| commit | e2db1dc442e9f28fe666537a8af024c810912bb4 (patch) | |
| tree | de16d36dff50a950dd963788689e18576a6db02f /.zfproject.xml | |
| parent | Inserted deleteForm (diff) | |
| parent | Änderungen an den Filtern (diff) | |
| download | pbs2-e2db1dc442e9f28fe666537a8af024c810912bb4.tar.gz pbs2-e2db1dc442e9f28fe666537a8af024c810912bb4.tar.xz pbs2-e2db1dc442e9f28fe666537a8af024c810912bb4.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Conflicts:
.zfproject.xml
Diffstat (limited to '.zfproject.xml')
| -rw-r--r-- | .zfproject.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/.zfproject.xml b/.zfproject.xml index be15633..ad4a683 100644 --- a/.zfproject.xml +++ b/.zfproject.xml @@ -25,6 +25,9 @@ </controllerFile> <controllerFile controllerName="Filter"> <actionMethod actionName="index"/> + <actionMethod actionName="addfilter"/> + <actionMethod actionName="removefilter"/> + <actionMethod actionName="editfilter"/> </controllerFile> </controllersDirectory> <formsDirectory> @@ -33,6 +36,7 @@ <formFile formName="PersonRegister"/> <formFile formName="FilterCreate"/> <formFile formName="AuthDelete"/> + <formFile formName="FilterAdd"/> </formsDirectory> <layoutsDirectory enabled="false"/> <modelsDirectory> @@ -138,6 +142,15 @@ <viewControllerScriptsDirectory forControllerName="Filter"> <viewScriptFile forActionName="index"/> </viewControllerScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Filter"> + <viewScriptFile forActionName="addfilter"/> + </viewControllerScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Filter"> + <viewScriptFile forActionName="removefilter"/> + </viewControllerScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Filter"> + <viewScriptFile forActionName="editfilter"/> + </viewControllerScriptsDirectory> </viewScriptsDirectory> <viewHelpersDirectory/> <viewFiltersDirectory enabled="false"/> |