Commit a453ef1b by HTML5-侯张振

channeladmin 冲突提交

parent 03b78cb0
...@@ -137,6 +137,9 @@ class Channeladmin extends CI_Controller ...@@ -137,6 +137,9 @@ class Channeladmin extends CI_Controller
$parentId=$this->input->post(); $parentId=$this->input->post();
$edit_channel=$this->channel->get(array('id'=>$channelId)); $edit_channel=$this->channel->get(array('id'=>$channelId));
$user = $this->manager->get(array('id'=>$edit_channel['manager_id'])); $user = $this->manager->get(array('id'=>$edit_channel['manager_id']));
$user_data=$this->session->userdata;
$this->data['data']=$user; $this->data['data']=$user;
if(!empty($parentId)){ if(!empty($parentId)){
if($parentId['parent_id']=='' && $parentId['manager_pwd']=='' && $parentId['ag_pwd']==''&& $parentId['region_id']=='' &&$parentId['building_id']==''){ if($parentId['parent_id']=='' && $parentId['manager_pwd']=='' && $parentId['ag_pwd']==''&& $parentId['region_id']=='' &&$parentId['building_id']==''){
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<div class="col-md-8"> <div class="col-md-8">
<?php if ($buildings) { <?php if ($buildings) {
foreach ($buildings as $key => $build) { ?> foreach ($buildings as $key => $build) { ?>
<label style="width: 24%;float: right;"> <label style="width: 24%;float: left;">
<input type="checkbox" class="building_id" name="building_id[]" value="<?php echo $build['id']; ?>" <?php if($key == 0) { ?> checked="checked" <?php } ?>> <?php echo $build['building_title']; ?> <input type="checkbox" class="building_id" name="building_id[]" value="<?php echo $build['id']; ?>" <?php if($key == 0) { ?> checked="checked" <?php } ?>> <?php echo $build['building_title']; ?>
</label> </label>
<?php } <?php }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment