projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d9df3c0
)
cmmit
author
benny
<benny@roojs.com>
Wed, 22 Aug 2018 08:34:34 +0000
(16:34 +0800)
committer
benny
<benny@roojs.com>
Wed, 22 Aug 2018 08:34:34 +0000
(16:34 +0800)
DataObjects/Events.php
patch
|
blob
|
history
Pman.js
patch
|
blob
|
history
diff --git
a/DataObjects/Events.php
b/DataObjects/Events.php
index
158bf5f
..
725e451
100644
(file)
--- a/
DataObjects/Events.php
+++ b/
DataObjects/Events.php
@@
-308,13
+308,13
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$ff = HTML_FlexyFramework::get();
$pg = $ff->page;
$au = $pg->getAuthUser();
$ff = HTML_FlexyFramework::get();
$pg = $ff->page;
$au = $pg->getAuthUser();
-
+
if ($ff->cli) { // && empty($au) && isset($obj->person_id)) {
$au = false;
// $au = DB_DataObject::Factory('Person'); // not always a person..
// $au->get($obj->person_id);
}
if ($ff->cli) { // && empty($au) && isset($obj->person_id)) {
$au = false;
// $au = DB_DataObject::Factory('Person'); // not always a person..
// $au->get($obj->person_id);
}
-
+
$this->person_name = $au && !empty($au->name) ? $au->name : '';
//print_r($au);
//exit;
$this->person_name = $au && !empty($au->name) ? $au->name : '';
//print_r($au);
//exit;
@@
-617,7
+617,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
function retrieveEventLog()
{
function retrieveEventLog()
{
-
+
$logdir = $this->logDir();
if (!$logdir) {
return false;
$logdir = $this->logDir();
if (!$logdir) {
return false;
diff --git
a/Pman.js
b/Pman.js
index
bb4438e
..
618ddda
100644
(file)
--- a/
Pman.js
+++ b/
Pman.js
@@
-551,7
+551,7
@@
Pman = new Roo.Document(
genericDelete : function(tab,tbl) {
var r = [];
genericDelete : function(tab,tbl) {
var r = [];
-
+
var s = tab.grid.getSelectionModel().getSelections();
if (!s.length) {
var s = tab.grid.getSelectionModel().getSelections();
if (!s.length) {
@@
-593,6
+593,7
@@
Pman = new Roo.Document(
},
failure: function(act) {
},
failure: function(act) {
+
Roo.log(act);
var msg = '';
try {
Roo.log(act);
var msg = '';
try {