Added the base administration of the users.
Still need to not show the non activated accounts by default.dev
Loic d'Anterroches
parent
2bfa4478e1
commit
3aaf24d3bb
|
|
@ -0,0 +1,206 @@
|
|||
<?php
|
||||
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/*
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# This file is part of InDefero, an open source project management application.
|
||||
# Copyright (C) 2008 Céondo Ltd and contributors.
|
||||
#
|
||||
# InDefero is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# InDefero is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
# ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/**
|
||||
* Update user's details.
|
||||
*/
|
||||
class IDF_Form_Admin_UserUpdate extends Pluf_Form
|
||||
{
|
||||
public $user = null;
|
||||
|
||||
public function initFields($extra=array())
|
||||
{
|
||||
$this->user = $extra['user'];
|
||||
$this->fields['first_name'] = new Pluf_Form_Field_Varchar(
|
||||
array('required' => false,
|
||||
'label' => __('First name'),
|
||||
'initial' => $this->user->first_name,
|
||||
'widget_attrs' => array(
|
||||
'maxlength' => 50,
|
||||
'size' => 15,
|
||||
),
|
||||
));
|
||||
$this->fields['last_name'] = new Pluf_Form_Field_Varchar(
|
||||
array('required' => true,
|
||||
'label' => __('Last name'),
|
||||
'initial' => $this->user->last_name,
|
||||
'widget_attrs' => array(
|
||||
'maxlength' => 50,
|
||||
'size' => 20,
|
||||
),
|
||||
));
|
||||
|
||||
$this->fields['email'] = new Pluf_Form_Field_Email(
|
||||
array('required' => true,
|
||||
'label' => __('Email'),
|
||||
'initial' => $this->user->email,
|
||||
'widget_attrs' => array(
|
||||
'maxlength' => 50,
|
||||
'size' => 20,
|
||||
),
|
||||
));
|
||||
|
||||
$this->fields['language'] = new Pluf_Form_Field_Varchar(
|
||||
array('required' => true,
|
||||
'label' => __('Language'),
|
||||
'initial' => $this->user->language,
|
||||
'widget' => 'Pluf_Form_Widget_SelectInput',
|
||||
'widget_attrs' => array(
|
||||
'choices' =>
|
||||
Pluf_L10n::getInstalledLanguages()
|
||||
),
|
||||
));
|
||||
|
||||
$this->fields['password'] = new Pluf_Form_Field_Varchar(
|
||||
array('required' => false,
|
||||
'label' => __('Password'),
|
||||
'initial' => '',
|
||||
'widget' => 'Pluf_Form_Widget_PasswordInput',
|
||||
'help_text' => Pluf_Template::markSafe(__('Leave blank if you do not want to change the password.').'<br />'.__('The password must be hard for other people to find it, but easy for the user to remember.')),
|
||||
'widget_attrs' => array(
|
||||
'maxlength' => 50,
|
||||
'size' => 15,
|
||||
),
|
||||
));
|
||||
$this->fields['password2'] = new Pluf_Form_Field_Varchar(
|
||||
array('required' => false,
|
||||
'label' => __('Confirm password'),
|
||||
'initial' => '',
|
||||
'widget' => 'Pluf_Form_Widget_PasswordInput',
|
||||
'widget_attrs' => array(
|
||||
'maxlength' => 50,
|
||||
'size' => 15,
|
||||
),
|
||||
));
|
||||
|
||||
$attrs = ($extra['request']->user->id == $this->user->id) ?
|
||||
array('readonly' => 'readonly') : array();
|
||||
$this->fields['active'] = new Pluf_Form_Field_Boolean(
|
||||
array('required' => false,
|
||||
'label' => __('Active'),
|
||||
'initial' => $this->user->active,
|
||||
'widget' => 'Pluf_Form_Widget_CheckboxInput',
|
||||
'widget_attrs' => $attrs,
|
||||
'help_text' => __('If the user is not getting the confirmation email or is abusing the system, you can directly enable or disable his account here.'),
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Save the model in the database.
|
||||
*
|
||||
* @param bool Commit in the database or not. If not, the object
|
||||
* is returned but not saved in the database.
|
||||
* @return Object Model with data set from the form.
|
||||
*/
|
||||
function save($commit=true)
|
||||
{
|
||||
if (!$this->isValid()) {
|
||||
throw new Exception(__('Cannot save the model from an invalid form.'));
|
||||
}
|
||||
unset($this->cleaned_data['password2']);
|
||||
$update_pass = false;
|
||||
if (strlen($this->cleaned_data['password']) == 0) {
|
||||
unset($this->cleaned_data['password']);
|
||||
} else {
|
||||
$update_pass = true;
|
||||
}
|
||||
$this->user->setFromFormData($this->cleaned_data);
|
||||
if ($commit) {
|
||||
$this->user->update();
|
||||
if ($update_pass) {
|
||||
/**
|
||||
* [signal]
|
||||
*
|
||||
* Pluf_User::passwordUpdated
|
||||
*
|
||||
* [sender]
|
||||
*
|
||||
* IDF_Form_UserAccount
|
||||
*
|
||||
* [description]
|
||||
*
|
||||
* This signal is sent when the user updated his
|
||||
* password from his account page.
|
||||
*
|
||||
* [parameters]
|
||||
*
|
||||
* array('user' => $user)
|
||||
*
|
||||
*/
|
||||
$params = array('user' => $this->user);
|
||||
Pluf_Signal::send('Pluf_User::passwordUpdated',
|
||||
'IDF_Form_Admin_UserUpdate', $params);
|
||||
}
|
||||
}
|
||||
return $this->user;
|
||||
}
|
||||
|
||||
function clean_last_name()
|
||||
{
|
||||
$last_name = trim($this->cleaned_data['last_name']);
|
||||
if ($last_name == mb_strtoupper($last_name)) {
|
||||
return mb_convert_case(mb_strtolower($last_name),
|
||||
MB_CASE_TITLE, 'UTF-8');
|
||||
}
|
||||
return $last_name;
|
||||
}
|
||||
|
||||
function clean_first_name()
|
||||
{
|
||||
$first_name = trim($this->cleaned_data['first_name']);
|
||||
if ($first_name == mb_strtoupper($first_name)) {
|
||||
return mb_convert_case(mb_strtolower($first_name),
|
||||
MB_CASE_TITLE, 'UTF-8');
|
||||
}
|
||||
return $first_name;
|
||||
}
|
||||
|
||||
function clean_email()
|
||||
{
|
||||
$email = mb_strtolower(trim($this->cleaned_data['email']));
|
||||
$sql = new Pluf_SQL('email=%s AND id!=%s',
|
||||
array($email, $this->user->id));
|
||||
$users = Pluf::factory('Pluf_User')->getList(array('filter'=>$sql->gen()));
|
||||
if ($users->count() > 0) {
|
||||
throw new Pluf_Form_Invalid(__('A user with this email already exists, please provide another email address.'));
|
||||
}
|
||||
return $email;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check to see if the 2 passwords are the same.
|
||||
*/
|
||||
public function clean()
|
||||
{
|
||||
if (!isset($this->errors['password'])
|
||||
&& !isset($this->errors['password2'])) {
|
||||
$password1 = $this->cleaned_data['password'];
|
||||
$password2 = $this->cleaned_data['password2'];
|
||||
if ($password1 != $password2) {
|
||||
throw new Pluf_Form_Invalid(__('The passwords do not match. Please give them again.'));
|
||||
}
|
||||
}
|
||||
return $this->cleaned_data;
|
||||
}
|
||||
}
|
||||
|
|
@ -142,4 +142,93 @@ class IDF_Views_Admin
|
|||
$request);
|
||||
}
|
||||
|
||||
/**
|
||||
* Users overview.
|
||||
*
|
||||
*/
|
||||
public $users_precond = array('Pluf_Precondition::staffRequired');
|
||||
public function users($request, $match)
|
||||
{
|
||||
$title = __('User List');
|
||||
$pag = new Pluf_Paginator(new Pluf_User());
|
||||
$pag->class = 'recent-issues';
|
||||
$pag->summary = __('This table shows the users in the forge.');
|
||||
$pag->action = 'IDF_Views_Admin::users';
|
||||
$pag->edit_action = array('IDF_Views_Admin::userUpdate', 'id');
|
||||
$pag->sort_order = array('login', 'ASC');
|
||||
$list_display = array(
|
||||
'login' => __('login'),
|
||||
array('last_name', 'Pluf_Paginator_ToString', __('Name')),
|
||||
array('staff', 'IDF_Views_Admin_bool', __('Staff')),
|
||||
array('administrator', 'IDF_Views_Admin_bool', __('Admin')),
|
||||
array('active', 'IDF_Views_Admin_bool', __('Active')),
|
||||
array('last_login', 'Pluf_Paginator_DateYMDHM', __('Last Login')),
|
||||
);
|
||||
$pag->extra_classes = array('', 'a-c', 'a-c', 'a-c', 'a-c', 'a-c');
|
||||
$pag->configure($list_display, array(), array('login'));
|
||||
$pag->items_per_page = 50;
|
||||
$pag->no_results_text = __('No users were found.');
|
||||
$pag->setFromRequest($request);
|
||||
return Pluf_Shortcuts_RenderToResponse('idf/gadmin/users/index.html',
|
||||
array(
|
||||
'page_title' => $title,
|
||||
'users' => $pag,
|
||||
),
|
||||
$request);
|
||||
}
|
||||
|
||||
/**
|
||||
* Edition of a user.
|
||||
*
|
||||
* Staff cannot edit other staff people and only admin can edit
|
||||
* staff.
|
||||
*/
|
||||
public $userUpdate_precond = array('Pluf_Precondition::staffRequired');
|
||||
public function userUpdate($request, $match)
|
||||
{
|
||||
$user = Pluf_Shortcuts_GetObjectOr404('Pluf_User', $match[1]);
|
||||
$title = sprintf(__('Update %s'), $user->__toString());
|
||||
$params = array(
|
||||
'user' => $user,
|
||||
'request' => $request,
|
||||
);
|
||||
// Check the rights.
|
||||
$url = Pluf_HTTP_URL_urlForView('IDF_Views_Admin::users');
|
||||
$error = __('You do not have the rights to update this user.');
|
||||
if ($user->administrator and $request->user->id != $user->id) {
|
||||
$request->user->setMessage($error);
|
||||
return new Pluf_HTTP_Response_Redirect($url);
|
||||
}
|
||||
if ($user->staff) {
|
||||
if (!$request->user->administrator and $request->user->id != $user->id) {
|
||||
$request->user->setMessage($error);
|
||||
return new Pluf_HTTP_Response_Redirect($url);
|
||||
}
|
||||
}
|
||||
|
||||
if ($request->method == 'POST') {
|
||||
$form = new IDF_Form_Admin_UserUpdate($request->POST, $params);
|
||||
if ($form->isValid()) {
|
||||
$form->save();
|
||||
$request->user->setMessage(__('The user has been updated.'));
|
||||
return new Pluf_HTTP_Response_Redirect($url);
|
||||
}
|
||||
} else {
|
||||
$form = new IDF_Form_Admin_UserUpdate(null, $params);
|
||||
}
|
||||
return Pluf_Shortcuts_RenderToResponse('idf/gadmin/users/update.html',
|
||||
array(
|
||||
'page_title' => $title,
|
||||
'cuser' => $user,
|
||||
'form' => $form,
|
||||
),
|
||||
$request);
|
||||
}
|
||||
}
|
||||
|
||||
function IDF_Views_Admin_bool($field, $item)
|
||||
{
|
||||
$img = ($item->$field) ? 'day' : 'night';
|
||||
$text = ($item->$field) ? __('Yes') : __('No');
|
||||
return sprintf('<img src="'.Pluf::f('url_media').'/idf/img/%s.png" alt="%s" /> ', $img, $text);
|
||||
}
|
||||
|
|
@ -417,6 +417,18 @@ $ctl[] = array('regex' => '#^/admin/projects/create/$#',
|
|||
'model' => 'IDF_Views_Admin',
|
||||
'method' => 'projectCreate');
|
||||
|
||||
$ctl[] = array('regex' => '#^/admin/users/$#',
|
||||
'base' => $base,
|
||||
'priority' => 4,
|
||||
'model' => 'IDF_Views_Admin',
|
||||
'method' => 'users');
|
||||
|
||||
$ctl[] = array('regex' => '#^/admin/users/(\d+)/$#',
|
||||
'base' => $base,
|
||||
'priority' => 4,
|
||||
'model' => 'IDF_Views_Admin',
|
||||
'method' => 'userUpdate');
|
||||
|
||||
// ---------- UTILITY VIEWS -------------------------------
|
||||
|
||||
$ctl[] = array('regex' => '#^/register/$#',
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@
|
|||
<div id="main-tabs">
|
||||
<a accesskey="1" href="{url 'IDF_Views_Admin::home'}"{block tabhome}{/block}>{trans 'Administer'}</a>
|
||||
<a href="{url 'IDF_Views_Admin::projects'}"{block tabprojects}{/block}>{trans 'Projects'}</a>
|
||||
<a href="{url 'IDF_Views_Admin::users'}"{block tabusers}{/block}>{trans 'People'}</a>
|
||||
</div>
|
||||
<div id="sub-tabs">{block subtabs}{/block}</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
{extends "idf/gadmin/base.html"}
|
||||
{block tabusers} class="active"{/block}
|
||||
{block subtabs}
|
||||
<a {if $inIndex}class="active" {/if}href="{url 'IDF_Views_Admin::users'}">{trans 'User List'}</a>
|
||||
{if $inUpdate} |
|
||||
<a class="active" href="{url 'IDF_Views_Admin::userUpdate', array($cuser.id)}">{trans 'Update User'}</a>
|
||||
{/if}
|
||||
|
||||
{/block}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
{extends "idf/gadmin/users/base.html"}
|
||||
|
||||
{block docclass}yui-t2{assign $inIndex=true}{/block}
|
||||
|
||||
{block body}
|
||||
{$users.render}
|
||||
{/block}
|
||||
{block context}
|
||||
<div class="issue-submit-info">
|
||||
{blocktrans}<p>You have here an overview of the users registered in the forge.</p>{/blocktrans}
|
||||
</div>
|
||||
{/block}
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
{extends "idf/gadmin/users/base.html"}
|
||||
{block docclass}yui-t1{assign $inUpdate=true}{/block}
|
||||
{block body}
|
||||
{if $form.errors}
|
||||
<div class="px-message-error">
|
||||
<p>{trans 'The form contains some errors. Please correct them to update the user.'}</p>
|
||||
{if $form.get_top_errors}
|
||||
{$form.render_top_errors|unsafe}
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
<form method="post" action=".">
|
||||
<table class="form" summary="">
|
||||
<tr>
|
||||
<th>{trans 'Login:'}</th>{aurl 'url', 'IDF_Views_User::view', array($cuser.login)}
|
||||
<td><a href="{$url}">{$cuser.login}</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{$form.f.first_name.labelTag}:</th>
|
||||
<td>{if $form.f.first_name.errors}{$form.f.first_name.fieldErrors}{/if}
|
||||
{$form.f.first_name|unsafe}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><strong>{$form.f.last_name.labelTag}:</strong></th>
|
||||
<td>{if $form.f.last_name.errors}{$form.f.last_name.fieldErrors}{/if}
|
||||
{$form.f.last_name|unsafe}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><strong>{$form.f.email.labelTag}:</strong></th>
|
||||
<td>{if $form.f.email.errors}{$form.f.email.fieldErrors}{/if}
|
||||
{$form.f.email|unsafe}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{$form.f.language.labelTag}:</th>
|
||||
<td>{if $form.f.language.errors}{$form.f.language.fieldErrors}{/if}
|
||||
{$form.f.language|unsafe}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{$form.f.password.labelTag}:</th>
|
||||
<td>{if $form.f.password.errors}{$form.f.password.fieldErrors}{/if}
|
||||
{$form.f.password|unsafe}<br />
|
||||
<span class="helptext">{$form.f.password.help_text}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{$form.f.password2.labelTag}:</th>
|
||||
<td>{if $form.f.password2.errors}{$form.f.password2.fieldErrors}{/if}
|
||||
{$form.f.password2|unsafe}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{if $form.f.active.errors}{$form.f.active.fieldErrors}{/if}
|
||||
{$form.f.active|unsafe}
|
||||
</th>
|
||||
<td>{$form.f.active.labelTag}<br />
|
||||
<span class="helptext">{$form.f.active.help_text}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td>
|
||||
<input type="submit" value="{trans 'Update User'}" name="submit" />
|
||||
| <a href="{url 'IDF_Views_Admin::users'}">{trans 'Cancel'}</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
{/block}
|
||||
{block context}
|
||||
<div class="issue-submit-info">
|
||||
<p><strong>{trans 'Instructions:'}</strong></p>
|
||||
<p>{blocktrans}If you are changing the email address of the user, you
|
||||
need to ensure that you are providing a valid email
|
||||
address{/blocktrans}</p>
|
||||
</div>
|
||||
{/block}
|
||||
|
||||
|
||||
|
||||
|
|
@ -43,6 +43,10 @@ a:active{
|
|||
text-align: right;
|
||||
}
|
||||
|
||||
.a-c {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.dellink {
|
||||
float: right;
|
||||
position: relative;
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 682 B |
Binary file not shown.
|
After Width: | Height: | Size: 961 B |
Loading…
Reference in New Issue