Skip to content

Commit

Permalink
status1, status2 and status3 in edit and insert class
Browse files Browse the repository at this point in the history
  • Loading branch information
AlvaroOmatech committed Dec 18, 2019
1 parent 2cb54f3 commit eccc328
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 13 deletions.
3 changes: 2 additions & 1 deletion src/admin/accions/admin_add_and_join.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public function render()
'instance' => $instance['instance_info'],
'p_mode' => $p_mode,
'body_class' => 'edit-view',
'title' => $title
'title' => $title,
'status_list' => isset($instance['status_list']) ? $instance['status_list'] : null
]);

return response()->view($view, $viewData);
Expand Down
11 changes: 9 additions & 2 deletions src/admin/accions/admin_edit_instance.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ public function render()
$javascript_attributes = $at_t->javascript_attributes;

$instance = $at->getInstanceAttributes('U', $params);
$view = 'editora::pages.instance';

}else{
$instance['instance_info']=null;
$title = getMessage('error_role_privileges');
$view ='editora::pages.permission_denied';
}

$viewData = array_merge($menu, [
Expand All @@ -44,9 +50,10 @@ public function render()
'body_class' => 'edit-view',
'title' => $title,
'instances' => $instances,
'javascript_attributes' => $javascript_attributes
'javascript_attributes' => $javascript_attributes,
'status_list' => isset($instance['status_list']) ? $instance['status_list'] : null
]);

return response()->view('editora::pages.instance', $viewData);
return response()->view($view, $viewData);
}
}
3 changes: 2 additions & 1 deletion src/admin/accions/admin_edit_instance2.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ public function render()
'title' => $title,
'instances' => $instances,
'parents' => $parents,
'message' => $message
'message' => $message,
'status_list' => isset($instance['status_list']) ? $instance['status_list'] : null
]);

return response()->view('editora::pages.instance', $viewData);
Expand Down
3 changes: 2 additions & 1 deletion src/admin/accions/admin_new_instance.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public function render()
'p_mode' => $p_mode,
'body_class' => 'edit-view',
'title' => $title,
'class' => $class_info
'class' => $class_info,
'status_list' => isset($instance['status_list']) ? $instance['status_list'] : null
]);


Expand Down
5 changes: 3 additions & 2 deletions src/admin/accions/admin_new_instance2.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ public function render()
'title' => $title,
'instances' => $instances,
'parents' => $parents,
'message' => $message
]);
'message' => $message,
'status_list' => isset($instance['status_list']) ? $instance['status_list'] : null
]);

return response()->view('editora::pages.instance', $viewData);
}
Expand Down
10 changes: 9 additions & 1 deletion src/admin/accions/admin_view_instance.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ public function render()
$instance = $at->getInstanceAttributes($p_mode, $params);

$parents = $instances->getDistinctParents($params);

$view = 'editora::pages.instance';
}else{
$instance['instance_info']=null;
$title = getMessage('error_role_privileges');
$view ='editora::pages.permission_denied';
}

$viewData = array_merge($menu, [
Expand All @@ -37,8 +43,10 @@ public function render()
'body_class' => 'edit-view',
'title' => $title,
'parents' => $parents,
'status_list' => isset($instance['status_list']) ? $instance['status_list'] : null

]);

return response()->view('editora::pages.instance', $viewData);
return response()->view( $view, e$viewData);
}
}
30 changes: 25 additions & 5 deletions src/admin/views/pages/instance.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,31 @@
<div class="form-row top">
<div class="form-group">
<label for="p_status" class="form-label">{{getMessage('info_word_status')}}</label>
<select class="form-control" name="p_status">
<option value="P" @if($instance['status']=="P") selected @endif>{{getMessage('info_word_status_pending')}}</option>
<option value="V" @if($instance['status']=="V") selected @endif>{{getMessage('info_word_status_reviewed')}}</option>
<option value="O" @if($instance['status']=="O") selected @endif>{{getMessage('info_word_status_published')}}</option>
</select>
@if($p_mode=='U' && ( $instance['status'] == "P" && $status_list['status1']==0 || $instance['status'] == "V" && $status_list['status2']==0 || $instance['status'] == "O" && $status_list['status3']==0) )
<select class="form-control" name="p_status" disabled>
@if($instance['status'] == "P")
<option value="P" @if($instance['status']=="P") selected @endif>{{getMessage('info_word_status_pending')}}</option>
@endif
@if($instance['status'] == "V")
<option value="V" @if($instance['status']=="V") selected @endif>{{getMessage('info_word_status_reviewed')}}</option>
@endif
@if($instance['status'] == "O")
<option value="O" @if($instance['status']=="O") selected @endif>{{getMessage('info_word_status_published')}}</option>
@endif
</select>
@else
<select class="form-control" name="p_status" @if( $status_list['status1']==0 && $status_list['status2']==0 && $status_list['status3']==0 && $p_mode=='I' ) disabled @endif>
@if($status_list['status1']==1 || $instance['status'] == "P" || $status_list['status1']==0 && $status_list['status2']==0 && $status_list['status3']==0 && $p_mode=='I' )
<option value="P" @if($instance['status']=="P") selected @endif>{{getMessage('info_word_status_pending')}}</option>
@endif
@if($status_list['status2']==1 || $instance['status'] == "V")
<option value="V" @if($instance['status']=="V") selected @endif>{{getMessage('info_word_status_reviewed')}}</option>
@endif
@if($status_list['status3']==1 || $instance['status'] == "O")
<option value="O" @if($instance['status']=="O") selected @endif>{{getMessage('info_word_status_published')}}</option>
@endif
</select>
@endif
</div>
<div class="form-group">
@php($attribute = $instance['instance_tabs'][0]['elsatribs'][0])
Expand Down

0 comments on commit eccc328

Please sign in to comment.