commit 9edd3443cdedc178daf7dca66763a52c4d3f3261
parent 2854a53bbb8eb84d237dcaa6b326cc50e1d356fb
Author: Jan Dankert <devnull@localhost>
Date: Sun, 6 Nov 2011 22:24:09 +0100
Perspektive \"Administration\": Views korrigiert und Actions angepasst.
Diffstat:
6 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/action/GroupAction.class.php b/action/GroupAction.class.php
@@ -189,12 +189,6 @@ class GroupAction extends Action
- /**
- * Dummy-Funktion.
- */
- function memberships()
- {
- }
@@ -202,7 +196,7 @@ class GroupAction extends Action
* Liste aller Benutzer in dieser Gruppe.
*
*/
- function usersView()
+ function membershipsView()
{
// Mitgliedschaften ermitteln
//
@@ -231,7 +225,7 @@ class GroupAction extends Action
}
- function usersAction()
+ function membershipsAction()
{
$allUsers = User::listAll();
$groupUsers = $this->group->getUsers();
diff --git a/action/GroupAction.ini.php b/action/GroupAction.ini.php
@@ -24,9 +24,6 @@ write=true
goto=users
[memberships]
-goto=users
-
-[users]
menu=memberships
editable=true
write=true
diff --git a/action/UserAction.class.php b/action/UserAction.class.php
@@ -254,12 +254,7 @@ class UserAction extends Action
}
- function memberships()
- {
- }
-
-
- function groupsView()
+ function membershipsView()
{
$gruppenListe = array();
@@ -286,7 +281,7 @@ class UserAction extends Action
}
- function groupsAction()
+ function membershipsAction()
{
$allGroups = Group::getAll();
$userGroups = $this->user->getGroups();
diff --git a/action/UserAction.ini.php b/action/UserAction.ini.php
@@ -20,11 +20,8 @@ write=true
menu=edit
write=true
-[memberships]
-goto=groups
-
; Gruppenzugehoerigkeiten
-[groups]
+[memberships]
menu=memberships
editable=true
write=yes
diff --git a/language/de.ini.php b/language/de.ini.php
@@ -774,15 +774,15 @@ MENU_PROJECT_ADD_DESC ="Neues Projekt anlegen"
MENU_PROJECT_ADD ="Neu"
MENU_PROJECT_EDIT_DESC = "Die Projekteinstellungen bearbeiten"
MENU_PROJECT_EDIT = "Einstellungen"
-MENU_PROJECT_EXPORT_DESC = "Das Projekt in eine andere Datenbank exportieren"
-MENU_PROJECT_EXPORT = Export
-MENU_PROJECT_INFO_DESC="Informationen zu diesem Projekt anzeigen"
-MENU_PROJECT_INFO="Info"
+MENU_EXPORT_DESC = "In eine andere Datenbank exportieren"
+MENU_EXPORT = Export
+MENU_INFO_DESC="Informationen anzeigen"
+MENU_INFO="Info"
MENU_PROJECT_LIST =Alle Projekte
MENU_PROJECT_LISTING_DESC =Alle Projekte anzeigen
MENU_PROJECT_LISTING =Projekte
-MENU_PROJECT_MAINTENANCE_DESC = "Integrität des Projektes prüfen"
-MENU_PROJECT_MAINTENANCE =Wartung
+MENU_MAINTENANCE_DESC = "Integrität prüfen"
+MENU_MAINTENANCE = "Wartung"
MENU_PROJECT_REMOVE_DESC = "Das Projekt entfernen"
MENU_PROJECT_REMOVE = "Entfernen"
MENU_PROP_DESC = "Eigenschaften wie Name, Beschreibung bearbeiten"
@@ -892,6 +892,8 @@ MENU_USER_EDIT = "Bearbeiten"
MENU_USER_EDIT_DESC = "Benutzerdaten bearbeiten"
MENU_USER_GROUPS_DESC = "Mitgliedschaften des Benutzers in Gruppen bearbeiten"
MENU_USER_GROUPS =Mitgliedschaften
+MENU_MEMBERSHIPS_DESC = "Mitgliedschaften bearbeiten"
+MENU_MEMBERSHIPS =Mitgliedschaften
MENU_USER_LISTING_DESC = "Alle Benutzer anzeigen"
MENU_USER_LISTING =Liste
MENU_USER_PW_DESC =Kennwort ändern
diff --git a/themes/default/layout/perspective/administration.ini.php b/themes/default/layout/perspective/administration.ini.php
@@ -11,7 +11,7 @@ refreshable=false
[content]
-views=listing,prop,edit,memberships
+views=listing,edit,pw,export,maintenance
action=project
refreshable=true
default=listing
@@ -19,7 +19,7 @@ default=listing
[member]
-views=groups
+views=groups,users,info
action=project
refreshable=true
default=groups