Browse Source

更改ActionBar的字段更新

DESKTOP-C21C1Q8\tangs 6 years ago
parent
commit
f6cff535f0

+ 4 - 5
app/Http/Controllers/ActionBarController.php

@@ -11,9 +11,9 @@ class ActionBarController extends Controller
     public function AddActionBar(Request $request)
     {
         $params = [];
-        $params["owner_id"] = $request->input("owner_id");
         $params["parent"] = $request->input("parent");
-        $params["level"] = $request->input("level");
+        $params["name"] = $request->input("name");
+        $params["description"] = $request->input("description");
         $params["icon"] = $request->input("icon");
         $params["link_type"] = $request->input("link_type");
         $params["link"] = $request->input("link");
@@ -30,14 +30,13 @@ class ActionBarController extends Controller
     {
         $params = [];
         $params["id"] = $request->input("id");
-        $params["owner_id"] = $request->input("owner_id");
         $params["parent"] = $request->input("parent");
-        $params["level"] = $request->input("level");
+        $params["name"] = $request->input("name");
+        $params["description"] = $request->input("description");
         $params["icon"] = $request->input("icon");
         $params["link_type"] = $request->input("link_type");
         $params["link"] = $request->input("link");
         $params["name"] = $request->input("name");
-        $params["description"] = $request->input("description");
 
         $bar = new Models\ActionBar();
         $result = $bar->ModifyActionBar($params);

+ 0 - 1
app/Http/Controllers/RoleController.php

@@ -16,7 +16,6 @@ class RoleController extends Controller
         $role = new Models\Role();
         $result = $role->CreateRole($params);
         return $result;
-
     }
 
     public function ModifyRole(Request $request)

+ 3 - 7
app/Models/ActionBar.php

@@ -16,18 +16,17 @@ class ActionBar extends Model
 
     /**
      * @param array $params
-     * owner_id 拥有者用户的id,0表示数据模板
      * parent ActionBar 的上一级id
-     * level 表示当前是第几级,冗余字段
      * icon ActionBar的图标
      * link_type ActionBar的时间类型,当期只有url跳转
      * link 根据link_type需要的数据,当前为url,也可以是页面上的某个id
+     * name ActionBar的名字
+     * description ActionBar的的描述
      * @return string
      */
     public function AddActionBar(array $params)
     {
         $this->parent = $params["parent"]; // default 0
-        $this->level = $params["level"];
         $this->icon = $params["icon"];
         $link_type = $params["link_type"];
         $this->link = $params["link"];
@@ -73,9 +72,6 @@ class ActionBar extends Model
         if ($params["parent"] > 0) {
             $update["parent"] = $params["parent"];
         }
-        if ($params["level"] > 0) {
-            $update["level"] = $params["level"];
-        }
         if (strlen($params["icon"]) > 0) {
             $update["icon"] = $params["icon"];
         }
@@ -135,7 +131,7 @@ class ActionBar extends Model
         $uid = $params["uid"];
 
         // 收集当前用户有权限的bar_id
-        $userActionBar = new UserActionBarController();
+        $userActionBar = new UserActionBar();
         $bar_ids = $userActionBar->ListActionBarIds($uid);
         if (count($bar_ids) == 0) {
             return [];