[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13423] class.uipermission
From: |
Saul |
Subject: |
[Fmsystem-commits] [13423] class.uipermission |
Date: |
Thu, 11 Jun 2015 22:55:24 +0000 |
Revision: 13423
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13423
Author: psaul
Date: 2015-06-11 22:55:23 +0000 (Thu, 11 Jun 2015)
Log Message:
-----------
class.uipermission
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uipermission.inc.php
Modified: branches/dev-syncromind/booking/inc/class.uipermission.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-06-11 22:53:07 UTC (rev 13422)
+++ branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-06-11 22:55:23 UTC (rev 13423)
@@ -1,8 +1,13 @@
<?php
- phpgw::import_class('booking.uicommon');
+// phpgw::import_class('booking.uicommon');
phpgw::import_class('booking.account_ui_utils');
+
+ phpgw::import_class('booking.uidocument_building');
+ phpgw::import_class('booking.uipermission_building');
+
+ phpgw::import_class('phpgwapi.uicommon_jquery');
- abstract class booking_uipermission extends booking_uicommon
+ abstract class booking_uipermission extends phpgwapi_uicommon_jquery
{
protected
$object_type = null;
@@ -10,6 +15,7 @@
public
$public_functions = array(
'index' => true,
+ 'query' => true,
'index_accounts' => true,
'show' => true,
'add' => true,
@@ -21,7 +27,7 @@
{
parent::__construct();
- self::process_booking_unauthorized_exceptions();
+// Analizar esta linea de permiso
self::process_booking_unauthorized_exceptions();
$this->set_business_object();
@@ -114,7 +120,7 @@
public function index()
{
if(phpgw::get_var('phpgw_return_as') == 'json') {
- return $this->index_json();
+ return $this->query();
}
$this->redirect_to_parent_if_inline();
@@ -122,15 +128,7 @@
self::add_javascript('booking', 'booking',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
-
- // if($_SESSION['showall'])
- // {
- // $active_botton = lang('Show only active');
- // }else{
- // $active_botton = lang('Show all');
- // }
-
-
+
$data = array(
'form' => array(
'toolbar' => array(
@@ -144,11 +142,6 @@
'name' =>
'search',
'value' =>
lang('Search')
),
- // array(
- // 'type' =>
'link',
- // 'value' =>
$active_botton,
- // 'href' =>
self::link(array('menuaction' => $this->get_object_typed_link('active')))
- // ),
)
),
),
@@ -168,10 +161,15 @@
'label' => lang('Role'),
),
array(
- 'key' => 'actions',
- 'label' =>
lang('Actions'),
- 'formatter' =>
'YAHOO.booking.'.sprintf('formatGenericLink(\'%s\', \'%s\')', lang('edit'),
lang('delete')),
+ 'key' => 'opcion_edit',
+ 'label' => lang('Edit'),
+ 'formatter' =>
'JqueryPortico.formatLinkGeneric',
),
+ array(
+ 'key' =>
'opcion_delete',
+ 'label' =>
lang('Delete'),
+ 'formatter' =>
'JqueryPortico.formatLinkGeneric',
+ ),
// array(
// 'key' => 'link',
// 'hidden' => true
@@ -188,10 +186,11 @@
));
}
- self::render_template('datatable', $data);
+// self::render_template('datatable', $data);
+ self::render_template_xsl('datatable_jquery',$data);
}
- public function index_json()
+ public function query()
{
$this->db = $GLOBALS['phpgw']->db;
@@ -203,8 +202,8 @@
#$permission['active'] = $permission['active']
? lang('Active') : lang('Inactive');
$permission_actions = array();
- if ($this->bo->allow_write($permission))
$permission_actions[] = $this->get_object_typed_link('edit', array('id' =>
$permission['id']));
- if ($this->bo->allow_delete($permission))
$permission_actions[] = $this->get_object_typed_link('delete', array('id' =>
$permission['id']));
+ if ($this->bo->allow_write($permission))
$permission['opcion_edit'] = $this->get_object_typed_link('edit', array('id' =>
$permission['id']));
+ if ($this->bo->allow_delete($permission))
$permission['opcion_delete'] = $this->get_object_typed_link('delete',
array('id' => $permission['id']));
$sql = "SELECT account_lastname,
account_firstname FROM phpgw_accounts WHERE account_lid =
'".$permission['subject_name']."'";
$this->db->query($sql);
@@ -214,8 +213,34 @@
$permission['actions'] = $permission_actions;
}
- return $this->yui_results($permissions);
+ return $this->jquery_results($permissions);
}
+
+// public function index_json()
+// {
+// $this->db = $GLOBALS['phpgw']->db;
+//
+// $permissions = $this->bo->read();
+// foreach($permissions['results'] as &$permission)
+// {
+// $permission['link'] =
$this->get_object_typed_link('edit', array('id' => $permission['id']));
+// $permission['role'] =
lang(self::humanize($permission['role']));
+// #$permission['active'] = $permission['active']
? lang('Active') : lang('Inactive');
+//
+// $permission_actions = array();
+// if ($this->bo->allow_write($permission))
$permission_actions[] = $this->get_object_typed_link('edit', array('id' =>
$permission['id']));
+// if ($this->bo->allow_delete($permission))
$permission_actions[] = $this->get_object_typed_link('delete', array('id' =>
$permission['id']));
+//
+// $sql = "SELECT account_lastname,
account_firstname FROM phpgw_accounts WHERE account_lid =
'".$permission['subject_name']."'";
+// $this->db->query($sql);
+// while ($record =
array_shift($this->db->resultSet)) {
+// $permission['subject_name'] =
$record['account_firstname']." ".$record['account_lastname'];
+// }
+//
+// $permission['actions'] = $permission_actions;
+// }
+// return $this->yui_results($permissions);
+// }
public function index_accounts()
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13423] class.uipermission,
Saul <=