Skip to content

Commit

Permalink
Merge bd442ff into 536a5b8
Browse files Browse the repository at this point in the history
  • Loading branch information
@hamaco
hamaco committed Apr 27, 2013
2 parents 536a5b8 + bd442ff commit 7d68c65
Show file tree
Hide file tree
Showing 29 changed files with 5,763 additions and 5,908 deletions.
697 changes: 352 additions & 345 deletions app/Controller/AccountController.php
View file

Large diffs are not rendered by default.

265 changes: 136 additions & 129 deletions app/Controller/AdminController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# @no_configuration_data = Redmine::DefaultData::Loader::no_data?
# end
#

# def plugins
# @plugins = Redmine::Plugin.all
# end
Expand Down Expand Up @@ -42,67 +42,68 @@
# }
# end
#end
class AdminController extends AppController {

var $name = 'Admin';
var $uses = array('Project');
var $helpers = array('Candy');
var $components = array('Sort','Mailer');

/**
* beforeFilter
*
* # before_filter :require_admin
*/
public function beforeFilter() {
parent::beforeFilter();
$this->require_admin();
}

function index()
{
}

/**
* projects
*
*/
function projects()
{
$this->Sort->sort_init('name', 'asc');
$this->Sort->sort_update(
array('name', 'is_public', 'created_on')
);

if (isset($this->request->query['status'])) {
$status = (int)$this->request->query['status'];
} else {
$status = 1;
class AdminController extends AppController
{
var $name = 'Admin';
var $uses = array('Project');
var $helpers = array('Candy');
var $components = array('Sort', 'Mailer');

/**
* beforeFilter
*
* # before_filter :require_admin
*/
public function beforeFilter()
{
parent::beforeFilter();
$this->require_admin();
}

$this->set('status', $status);

$status_options = array(
'' => __('all'),
1 => __('active'),
);

$this->set('status_options', $status_options);

if ($status == '1') {
$condition = array('Project.status' => $status);
} else {
$condition = array();
function index()
{
}

$name = null;
if(!empty($this->request->query['name'])) {
$name = $this->request->query['name'];
$q_name = "%{$name}%";
$condition['LOWER(Project.identifier) LIKE ? OR LOWER(Project.name) LIKE ?'] = array($q_name, $q_name);
}

$this->set('name', $name);
/**
* projects
*
*/
function projects()
{
$this->Sort->sort_init('name', 'asc');
$this->Sort->sort_update(
array('name', 'is_public', 'created_on')
);

if (isset($this->request->query['status'])) {
$status = (int)$this->request->query['status'];
} else {
$status = 1;
}

$this->set('status', $status);

$status_options = array(
'' => __('all'),
1 => __('active'),
);

$this->set('status_options', $status_options);

if ($status == '1') {
$condition = array('Project.status' => $status);
} else {
$condition = array();
}

$name = null;
if (!empty($this->request->query['name'])) {
$name = $this->request->query['name'];
$q_name = "%{$name}%";
$condition['LOWER(Project.identifier) LIKE ? OR LOWER(Project.name) LIKE ?'] = array($q_name, $q_name);
}

$this->set('name', $name);

# @project_count = Project.count(:conditions => c.conditions)
# @project_pages = Paginator.new self, @project_count,
Expand All @@ -114,80 +115,86 @@ function projects()
# :offset => @project_pages.current.offset
#

// @todo fix limit count
$projects = $this->Project->find('all',
array(
'recursive' => 0,
'conditions' => $condition,
'limit' => 10,
)
);
// @todo fix limit count
$projects = $this->Project->find('all',
array(
'recursive' => 0,
'conditions' => $condition,
'limit' => 10,
)
);

$this->set('projects', $projects);
$this->set('projects', $projects);
# render :action => "projects", :layout => false if request.xhr?
}

public function plugins() {
$pluginContainer = ClassRegistry::getObject('PluginContainer');
$pluginContainer->fetchEntry();
$this->set('plugins',$pluginContainer->getEntries());
}

public function installPlugin($id){
$pluginContainer = ClassRegistry::getObject('PluginContainer');
$pluginContainer->fetchEntry();
if ($pluginContainer->install($id)) {
$this->Session->setFlash(sprintf(__('Installed plugin: %s'),$id), 'default', array('class'=>'flash flash_notice'));
}
$this->redirect('plugins');
}

public function upgradePlugin($id) {
$pluginContainer = ClassRegistry::getObject('PluginContainer');
$pluginContainer->fetchEntry();
if ($pluginContainer->upgrade($id)) {
$this->Session->setFlash(
sprintf(__('Upgrade plugin: %s'), $id),
'default',
array('class' => 'flash flash_notice')
);
}
$this->redirect('plugins');
}

public function uninstallPlugin($id){
$pluginContainer = ClassRegistry::getObject('PluginContainer');
$pluginContainer->fetchEntry();
if ($pluginContainer->uninstall($id)) {
$this->Session->setFlash(sprintf(__('Uninstalled plugin: %s'),$id), 'default', array('class'=>'flash flash_notice'));
}
$this->redirect('plugins');
}

public function default_configration() {
}

public function test_email() {
if ($this->Mailer->deliver_test($this->current_user)) {
$this->Session->setFlash(sprintf(__('An email was sent to %s'),$this->current_user['mail']), 'default', array('class'=>'flash flash_notice'));
} else {
$this->Session->setFlash(sprintf(__('An error occurred while sending mail (%s)'),$this->current_user['mail']), 'default', array('class'=>'flash flash_error'));
}
$this->redirect(array(
'controller' => 'settings',
'action' => 'edit',
'tab' => 'notifications'
));
}
}

/**
* info
*
*/
public function info() {
$db =& ConnectionManager::getDataSource($this->Project->useDbConfig);
$this->set('db_driver', $db->config['datasource']);
}
public function plugins()
{
$pluginContainer = ClassRegistry::getObject('PluginContainer');
$pluginContainer->fetchEntry();
$this->set('plugins', $pluginContainer->getEntries());
}

public function installPlugin($id)
{
$pluginContainer = ClassRegistry::getObject('PluginContainer');
$pluginContainer->fetchEntry();
if ($pluginContainer->install($id)) {
$this->Session->setFlash(sprintf(__('Installed plugin: %s'), $id), 'default', array('class' => 'flash flash_notice'));
}
$this->redirect('plugins');
}

public function upgradePlugin($id)
{
$pluginContainer = ClassRegistry::getObject('PluginContainer');
$pluginContainer->fetchEntry();
if ($pluginContainer->upgrade($id)) {
$this->Session->setFlash(
sprintf(__('Upgrade plugin: %s'), $id),
'default',
array('class' => 'flash flash_notice')
);
}
$this->redirect('plugins');
}

public function uninstallPlugin($id)
{
$pluginContainer = ClassRegistry::getObject('PluginContainer');
$pluginContainer->fetchEntry();
if ($pluginContainer->uninstall($id)) {
$this->Session->setFlash(sprintf(__('Uninstalled plugin: %s'), $id), 'default', array('class' => 'flash flash_notice'));
}
$this->redirect('plugins');
}

public function default_configration()
{
}

public function test_email()
{
if ($this->Mailer->deliver_test($this->current_user)) {
$this->Session->setFlash(sprintf(__('An email was sent to %s'), $this->current_user['mail']), 'default', array('class' => 'flash flash_notice'));
} else {
$this->Session->setFlash(sprintf(__('An error occurred while sending mail (%s)'), $this->current_user['mail']), 'default', array('class' => 'flash flash_error'));
}
$this->redirect(array(
'controller' => 'settings',
'action' => 'edit',
'tab' => 'notifications'
));
}

/**
* info
*
*/
public function info()
{
$db =& ConnectionManager::getDataSource($this->Project->useDbConfig);
$this->set('db_driver', $db->config['datasource']);
}
}

0 comments on commit 7d68c65

Please sign in to comment.