comanage-dev - [comanage-dev] r367 - in registry/trunk/app: Config/Schema Controller Model View/CmpEnrollmentConfigurations
Subject: COmanage Developers List
List archive
[comanage-dev] r367 - in registry/trunk/app: Config/Schema Controller Model View/CmpEnrollmentConfigurations
Chronological Thread
- From:
- To:
- Subject: [comanage-dev] r367 - in registry/trunk/app: Config/Schema Controller Model View/CmpEnrollmentConfigurations
- Date: Tue, 25 Sep 2012 21:20:47 -0400
Author: benno
Date: 2012-09-25 21:20:47 -0400 (Tue, 25 Sep 2012)
New Revision: 367
Modified:
registry/trunk/app/Config/Schema/schema.xml
registry/trunk/app/Controller/CmpEnrollmentConfigurationsController.php
registry/trunk/app/Model/CmpEnrollmentConfiguration.php
registry/trunk/app/View/CmpEnrollmentConfigurations/fields.inc
Log:
Clean up CMP Enrollment Configuration following CO-436
Modified: registry/trunk/app/Config/Schema/schema.xml
===================================================================
--- registry/trunk/app/Config/Schema/schema.xml 2012-09-26 01:14:49 UTC (rev
366)
+++ registry/trunk/app/Config/Schema/schema.xml 2012-09-26 01:20:47 UTC (rev
367)
@@ -483,11 +483,6 @@
<field name="name" type="C" size="128">
<unique />
</field>
- <field name="self_enroll" type="L" />
- <field name="self_require_authn" type="L" />
- <field name="admin_enroll" type="C" size="1" />
- <field name="admin_confirm_email" type="L" />
- <field name="admin_require_authn" type="L" />
<field name="attrs_from_ldap" type="L" />
<field name="attrs_from_saml" type="L" />
<field name="attrs_from_coef" type="L" />
Modified:
registry/trunk/app/Controller/CmpEnrollmentConfigurationsController.php
===================================================================
--- registry/trunk/app/Controller/CmpEnrollmentConfigurationsController.php
2012-09-26 01:14:49 UTC (rev 366)
+++ registry/trunk/app/Controller/CmpEnrollmentConfigurationsController.php
2012-09-26 01:20:47 UTC (rev 367)
@@ -169,11 +169,6 @@
$ef['CmpEnrollmentConfiguration'] = array(
'name' => 'CMP Enrollment Configuration',
- 'self_enroll' => false,
- 'self_require_authn' => false,
- 'admin_enroll' => AdministratorEnum::CoAdmin,
- 'admin_confirm_email' => true,
- 'admin_require_authn' => false,
'attrs_from_ldap' => false,
'attrs_from_saml' => false,
'status' => StatusEnum::Active
Modified: registry/trunk/app/Model/CmpEnrollmentConfiguration.php
===================================================================
--- registry/trunk/app/Model/CmpEnrollmentConfiguration.php 2012-09-26
01:14:49 UTC (rev 366)
+++ registry/trunk/app/Model/CmpEnrollmentConfiguration.php 2012-09-26
01:20:47 UTC (rev 367)
@@ -49,23 +49,6 @@
'required' => true,
'message' => 'A name must be provided'
),
- 'self_enroll' => array(
- 'rule' => array('boolean')
- ),
- 'self_require_authn' => array(
- 'rule' => array('boolean')
- ),
- 'admin_enroll' => array(
- 'rule' => array('inList', array(AdministratorEnum::NoAdmin,
- AdministratorEnum::CoOrCouAdmin,
- AdministratorEnum::CoAdmin))
- ),
- 'admin_confirm_email' => array(
- 'rule' => array('boolean')
- ),
- 'admin_require_authn' => array(
- 'rule' => array('boolean')
- ),
'attrs_from_ldap' => array(
'rule' => array('boolean')
),
Modified: registry/trunk/app/View/CmpEnrollmentConfigurations/fields.inc
===================================================================
--- registry/trunk/app/View/CmpEnrollmentConfigurations/fields.inc
2012-09-26 01:14:49 UTC (rev 366)
+++ registry/trunk/app/View/CmpEnrollmentConfigurations/fields.inc
2012-09-26 01:20:47 UTC (rev 367)
@@ -131,78 +131,6 @@
<tbody>
<tr class="line1">
<td>
- <b><?php print _txt('fd.ef.se'); ?></b><br />
- <font class="desc"><?php print _txt('fd.ef.se.desc'); ?></font>
- </td>
- <td>
- <?php print ($e
- ? $this->Form->input('self_enroll', array('onClick'
=> 'fields_update_gadgets()'))
- :
Sanitize::html($cmp_enrollment_configurations[0]['CmpEnrollmentConfiguration']['self_enroll']));
?>
- </td>
- </tr>
- <tr class="line2">
- <td>
- <b><?php print _txt('fd.ef.sea'); ?></b><br />
- <font class="desc"><?php print _txt('fd.ef.sea.desc'); ?></font>
- </td>
- <td>
- <?php print ($e
- ? $this->Form->input('self_require_authn',
array('onClick' => 'fields_update_gadgets()'))
- :
Sanitize::html($cmp_enrollment_configurations[0]['CmpEnrollmentConfiguration']['self_require_authn']));
?>
- </td>
- </tr>
- <tr class="line1">
- <td>
- <b><?php print _txt('fd.ef.ae'); ?></b><br />
- <font class="desc"><?php print _txt('fd.ef.ae.desc'); ?></font>
- </td>
- <td>
- <?php
- global $cm_lang, $cm_texts;
- $attrs['value'] = (isset($cmp_enrollment_configurations)
- ?
$cmp_enrollment_configurations[0]['CmpEnrollmentConfiguration']['admin_enroll']
- : AdministratorEnum::NoAdmin);
- $attrs['empty'] = false;
- $attrs['onChange'] = 'fields_update_gadgets()';
-
- if($e) {
- print $this->Form->select('admin_enroll',
- $cm_texts[ $cm_lang ]['en.admin'],
- $attrs);
-
- if($this->Form->isFieldError('admin_enroll')) {
- print $this->Form->error('admin_enroll');
- }
- } else {
- print _txt('en.admin', null,
$cmp_enrollment_configurations[0]['CmpEnrollmentConfiguration']['admin_enroll']);
- }
- ?>
- </td>
- </tr>
- <tr class="line2">
- <td>
- <b><?php print _txt('fd.ef.aee'); ?></b><br />
- <font class="desc"><?php print _txt('fd.ef.aee.desc'); ?></font>
- </td>
- <td>
- <?php print ($e
- ? $this->Form->input('admin_confirm_email',
array('onClick' => 'fields_update_gadgets()'))
- :
Sanitize::html($cmp_enrollment_configurations[0]['CmpEnrollmentConfiguration']['admin_confirm_email']));
?>
- </td>
- </tr>
- <tr class="line1">
- <td>
- <b><?php print _txt('fd.ef.aea'); ?></b><br />
- <font class="desc"><?php print _txt('fd.ef.aea.desc'); ?></font>
- </td>
- <td>
- <?php print ($e
- ? $this->Form->input('admin_require_authn',
array('onClick' => 'fields_update_gadgets()'))
- :
Sanitize::html($cmp_enrollment_configurations[0]['CmpEnrollmentConfiguration']['admin_require_authn']));
?>
- </td>
- </tr>
- <tr class="line2">
- <td>
<b><?php print _txt('fd.ef.ldap'); ?></b><br />
<font class="desc"><?php print _txt('fd.ef.ldap.desc'); ?></font>
</td>
@@ -212,7 +140,7 @@
:
Sanitize::html($cmp_enrollment_configurations[0]['CmpEnrollmentConfiguration']['attrs_from_ldap']));
?>
</td>
</tr>
- <tr class="line1">
+ <tr class="line2">
<td>
<b><?php print _txt('fd.ef.saml'); ?></b><br />
<font class="desc"><?php print _txt('fd.ef.saml.desc'); ?></font>
@@ -223,7 +151,7 @@
:
Sanitize::html($cmp_enrollment_configurations[0]['CmpEnrollmentConfiguration']['attrs_from_saml']));
?>
</td>
</tr>
- <tr class="line2">
+ <tr class="line1">
<td>
<b><?php print _txt('fd.ef.coef'); ?></b><br />
<font class="desc"><?php print _txt('fd.ef.coef.desc'); ?></font>
@@ -234,7 +162,7 @@
:
Sanitize::html($cmp_enrollment_configurations[0]['CmpEnrollmentConfiguration']['attrs_from_coef']));
?>
</td>
</tr>
- <tr class="line1">
+ <tr class="line2">
<td>
<b><?php print _txt('fd.ef.pool'); ?></b><br />
<font class="desc"><?php print _txt('fd.ef.pool.desc'); ?></font>
- [comanage-dev] r367 - in registry/trunk/app: Config/Schema Controller Model View/CmpEnrollmentConfigurations, svnlog, 09/25/2012
Archive powered by MHonArc 2.6.16.