summaryrefslogtreecommitdiffstats
path: root/application/modules/user
diff options
context:
space:
mode:
authorSimon2011-04-25 13:48:57 +0200
committerSimon2011-04-25 13:48:57 +0200
commit44706d9b06bd2ea3dfbdeb7a9dedce6c62993e65 (patch)
tree3365419d99b00b434bc7e421b6043b0fc93f4e82 /application/modules/user
parentFehlermeldungen in GroupsGroupsMapper korrigiert (diff)
parentupload data fix (diff)
downloadpbs2-44706d9b06bd2ea3dfbdeb7a9dedce6c62993e65.tar.gz
pbs2-44706d9b06bd2ea3dfbdeb7a9dedce6c62993e65.tar.xz
pbs2-44706d9b06bd2ea3dfbdeb7a9dedce6c62993e65.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user')
-rw-r--r--application/modules/user/controllers/ConfigController.php4
-rw-r--r--application/modules/user/forms/Bootos.php1
-rw-r--r--application/modules/user/forms/Preboot.php3
-rw-r--r--application/modules/user/views/scripts/config/index.phtml18
4 files changed, 10 insertions, 16 deletions
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index 6acb697..eca5d54 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -360,7 +360,9 @@ class user_ConfigController extends Zend_Controller_Action
if(!Pbs_Acl::checkRight('ce'))
$this->_redirect('/user/config/showconfig/type/'.$this->type.'/configID/'.$configID.'/modifyresult/forbidden');
}
-
+
+ $bootosuser->setID($bootosuserID);
+ $bootosuser->setConfigID($configID);
$bootosuser->setHomepath(str_replace("%login-name%", $bootosuser->getLogin(), $bootosuser->getHomepath()));
if($bootosuser->getPassword() != '%password%')
$bootosuser->setPassword(crypt($bootosuser->getPassword(), '$6$'.randomString(8).'$'));
diff --git a/application/modules/user/forms/Bootos.php b/application/modules/user/forms/Bootos.php
index 5e20a8a..432f0c7 100644
--- a/application/modules/user/forms/Bootos.php
+++ b/application/modules/user/forms/Bootos.php
@@ -37,6 +37,7 @@ class user_Form_Bootos extends Zend_Form
{
$this->setName("BootOsCreate");
$this->setMethod('post');
+ $this->setEnctype("multipart/form-data");
if (!Pbs_Acl::checkRight('boe') && $this->action == 'editbootos')
$meta = true;
diff --git a/application/modules/user/forms/Preboot.php b/application/modules/user/forms/Preboot.php
index 54dc216..f1a609f 100644
--- a/application/modules/user/forms/Preboot.php
+++ b/application/modules/user/forms/Preboot.php
@@ -27,7 +27,8 @@ class user_Form_Preboot extends Zend_Form
{
$this->setName($this->action);
$this->setMethod('post');
-
+ $this->setEnctype("multipart/form-data");
+
if (!Pbs_Acl::checkRight('pre') && $this->action == 'editpreboot')
$meta = true;
else
diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml
index 37f5a9f..8ca5875 100644
--- a/application/modules/user/views/scripts/config/index.phtml
+++ b/application/modules/user/views/scripts/config/index.phtml
@@ -34,7 +34,7 @@
<div class='element'>
<div class='number'>
<div class='smallnumber'>BootOs</div>
- <?php echo $k ?>
+ <?php echo $k+1 ?>
</div>
<div class='content'>
<div class='actions'>
@@ -59,7 +59,7 @@
<?php ?>
<div class='title'><?php echo $this->escape($bootos->getTitle()); ?></div>
<div class='subtitle'><?php echo $this->escape($bootos->getGroupID()); ?> - <?php echo $this->escape($bootos->getDescription()); ?></div>
- <div class='details'>
+ <div class='details dispnone'>
<?php if(count($this->configlist[$bootos->getID()])==0)
echo "There are no Config's to display." ?>
<?php foreach ($this->configlist[$bootos->getID()] as $k => $config): ?>
@@ -110,7 +110,7 @@
</div>
<div class='title'><?php echo $this->escape($config->getTitle()); ?></div>
<div class='subtitle'><?php echo $this->escape($config->getDescription()) ?></div>
- <div class='details'>
+ <div class='details dispnone'>
<?php if(Pbs_Acl::checkRight('csai')): ?>
<label>ConfigID</label>
<div class='item'><?php echo $this->escape($config->getID()); ?></div>
@@ -135,14 +135,4 @@
<?php echo $this->pagination; ?>
-<script type="text/javascript">
-$(document).ready(function(){
- if($('.element').find('.dispnone').length >= 1){
- $(this).find('.title').css('cursor','pointer');
-
- $('.title').click(function(){
- $(this).siblings('.dispnone').toggle();
- });
- }
-});
-</script>
+