summaryrefslogtreecommitdiffstats
path: root/application/modules/user
diff options
context:
space:
mode:
authormichael pereira2011-04-22 11:54:32 +0200
committermichael pereira2011-04-22 11:54:32 +0200
commit47062bd7f255baaa6c89092610d6f726e3ba72f5 (patch)
tree016c9a86a5d6f0eb38d6404700c12648129cdfff /application/modules/user
parentcontroller fixes (diff)
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-47062bd7f255baaa6c89092610d6f726e3ba72f5.tar.gz
pbs2-47062bd7f255baaa6c89092610d6f726e3ba72f5.tar.xz
pbs2-47062bd7f255baaa6c89092610d6f726e3ba72f5.zip
merge
Diffstat (limited to 'application/modules/user')
-rw-r--r--application/modules/user/forms/Bootiso.php3
-rw-r--r--application/modules/user/views/scripts/config/index.phtml4
-rw-r--r--application/modules/user/views/scripts/pool/index.phtml2
-rw-r--r--application/modules/user/views/scripts/session/index.phtml2
4 files changed, 6 insertions, 5 deletions
diff --git a/application/modules/user/forms/Bootiso.php b/application/modules/user/forms/Bootiso.php
index af474b5..091f448 100644
--- a/application/modules/user/forms/Bootiso.php
+++ b/application/modules/user/forms/Bootiso.php
@@ -48,7 +48,8 @@ class user_Form_Bootiso extends Zend_Form
),
'required' => true,
'label' => 'Title:',
- ));
+ ));
+
$this->addElement('textarea', 'description', array(
'filters' => array('StringTrim'),
diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml
index bfcce9f..9bdf185 100644
--- a/application/modules/user/views/scripts/config/index.phtml
+++ b/application/modules/user/views/scripts/config/index.phtml
@@ -74,9 +74,7 @@
<?php if(Pbs_Acl::checkRight('csai')): ?>
<label>ConfigID</label>
<div class='item'><?php echo $this->escape($config->getID()); ?></div>
- <?php endif; ?>
- <label>Shellscript</label>
- <div class='item'><?php echo $this->escape($config->getShellscript()); ?></div>
+ <?php endif; ?>
<label>Created</label>
<div class='item'><?php echo $this->escape($config->getCreated()); ?></div>
</div>
diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml
index f78df6a..95eb474 100644
--- a/application/modules/user/views/scripts/pool/index.phtml
+++ b/application/modules/user/views/scripts/pool/index.phtml
@@ -111,6 +111,8 @@
<div class='item'><?php echo ($cli->macAdress); ?></div>
<label>Hardwarehash</label>
<div class='item'><?php echo ($cli->hardwarehash); ?></div>
+ <label>Created</label>
+ <div class='item'><?php echo date(Zend_Registry::get('dateformat'),$cli->created); ?></div>
</div>
</div>
<div class='clear'></div>
diff --git a/application/modules/user/views/scripts/session/index.phtml b/application/modules/user/views/scripts/session/index.phtml
index 67c8b8d..8f5eed6 100644
--- a/application/modules/user/views/scripts/session/index.phtml
+++ b/application/modules/user/views/scripts/session/index.phtml
@@ -33,7 +33,7 @@
<div class='item'><?php echo $this->escape($session->getBootmenuentryID()) ?>&nbsp;</div>
<label>BootosID</label>
<div class='item'><?php echo $this->escape($session->getBootosID()) ?>&nbsp;</div>
- <label>BootIsoID</label>
+ <label>BootMediumID</label>
<div class='item'><?php echo $this->escape($session->getBootisoID()) ?>&nbsp;</div>
<label>MembershipID</label>
<div class='item'><?php echo $this->escape($session->getMembershipID()) ?>&nbsp;</div>