comanage-dev - [comanage-dev] r116 - trunk/app/controllers
Subject: COmanage Developers List
List archive
- From:
- To:
- Subject: [comanage-dev] r116 - trunk/app/controllers
- Date: Thu, 17 Nov 2011 23:16:15 -0500
Author: benno
Date: 2011-11-17 23:16:15 -0500 (Thu, 17 Nov 2011)
New Revision: 116
Modified:
trunk/app/controllers/co_people_controller.php
trunk/app/controllers/org_identities_controller.php
Log:
[CO-85] Fix ? on delete
Modified: trunk/app/controllers/co_people_controller.php
===================================================================
--- trunk/app/controllers/co_people_controller.php 2011-11-01 18:53:18
UTC (rev 115)
+++ trunk/app/controllers/co_people_controller.php 2011-11-18 04:16:15
UTC (rev 116)
@@ -217,6 +217,8 @@
return($c[$req][$model->displayField]);
if(isset($this->data['Name']))
return(generateCn($this->data['Name']));
+ if(isset($c['Name']))
+ return(generateCn($c['Name']));
else
return("(?)");
}
Modified: trunk/app/controllers/org_identities_controller.php
===================================================================
--- trunk/app/controllers/org_identities_controller.php 2011-11-01 18:53:18
UTC (rev 115)
+++ trunk/app/controllers/org_identities_controller.php 2011-11-18 04:16:15
UTC (rev 116)
@@ -211,11 +211,13 @@
// Get a pointer to our model
$req = $this->modelClass;
$model = $this->$req;
-
+
if(isset($c[$req][$model->displayField]))
return($c[$req][$model->displayField]);
elseif(isset($this->data['Name']))
return(generateCn($this->data['Name']));
+ elseif(isset($c['Name']))
+ return(generateCn($c['Name']));
else
return("(?)");
}
- [comanage-dev] r116 - trunk/app/controllers, benno, 11/17/2011
Archive powered by MHonArc 2.6.16.