fix issue

templates/admin/cloudbrain/imagecommit.tmpl

@@ -29,7 +29,7 @@
             <h4 class="ui top attached header">
                 {{.i18n.Tr "repo.submit_image"}}
             </h4>
-            <div class="submit-image-tmplvalue" style="display: none;" data-link="{{$.Link}}"></div>
+            <div class="submit-image-tmplvalue" style="display: none;" data-link="{{$.Link}}" data-edit-page="{{.PageIsAdminImages}}"></div>
             <div class="ui attached segment" style="padding: 2em 3em;padding-bottom: 7rem;">
                 <div class="ui form" id="form_image">
                     <input type="hidden" name="edit" value="edit">
@@ -125,5 +125,4 @@
             </div>
         </div>
     </div>
-{{template "base/footer" .}}
-    
+{{template "base/footer" .}}

web_src/js/components/images/adminImages.vue

@@ -27,7 +27,7 @@
                          </el-dropdown>
             </div>
             <div class="ui six wide column right aligned" style="margin: 1rem 0;">
-                    <a class="ui blue small button" href="/admin/images/commit_image?from=imageAdmin">创建云脑镜像</a>
+                    <a class="ui blue small button" href="/admin/images/commit_image">创建云脑镜像</a>
             </div>
             <div class="ui sixteen wide column" style="padding: 0;">
                 <el-table
@@ -117,12 +117,8 @@
                                         <svg width="1.4em" height="1.4em" viewBox="0 0 32 32" class="heart-stroke"><path d="M4.4 6.54c-1.761 1.643-2.6 3.793-2.36 6.056.24 2.263 1.507 4.521 3.663 6.534a29110.9 29110.9 0 0010.296 9.633l10.297-9.633c2.157-2.013 3.424-4.273 3.664-6.536.24-2.264-.599-4.412-2.36-6.056-1.73-1.613-3.84-2.29-6.097-1.955-1.689.25-3.454 1.078-5.105 2.394l-.4.319-.398-.319c-1.649-1.316-3.414-2.143-5.105-2.394a7.612 7.612 0 00-1.113-.081c-1.838 0-3.541.694-4.983 2.038z"></path></svg>    
                                         <span style="line-height: 2;margin-left:0.3rem;">{{scope.row.numStars}}</span>
                                     </div>
-                                    <template v-if="!scope.row.isPrivate">
                                             <span style="padding: 0 1rem;color: rgb(250, 140, 22);cursor:pointer;" v-if="scope.row.type==5" @click="unSetRecommend(scope.$index,scope.row.id)">取消推荐</span>
-                                            <span style="padding: 0 1rem;color: rgb(19, 194, 141);cursor:pointer;" v-else @click="setRecommend(scope.$index,scope.row.id)">设为推荐</span>
-                                    </template>
-                                    
-                                    
+                                            <span style="padding: 0 1rem;color: rgb(19, 194, 141);cursor:pointer;" v-if="scope.row.type!==5 && !scope.row.isPrivate" @click="setRecommend(scope.$index,scope.row.id)">设为推荐</span>
                                     <span style="padding: 0 1rem;color:#0366d6;cursor:pointer;" @click="copyUrl(scope.row.place)">复制地址</span>
                                     <div style="padding-left:1rem;cursor:pointer;">
                                         <el-dropdown size="medium">

web_src/js/features/images.js

@@ -165,12 +165,13 @@ export default async function initImage(){
         return false
     })
     $('#cancel_submit_image').click(()=>{
+        console.log(pageform)
         if(link.includes('cloudbrain')){
             let repoLink = link.split('cloudbrain')[0]
             location.href = `${window.config.AppSubUrl}${repoLink}debugjob?debugListType=all`
         }else if(pageform=='imageSquare'){
             location.href = `${window.config.AppSubUrl}/explore/images?type=myimage`
-        }else if(pageform=='imageAdmin'){
+        }else if(pageform){
             location.href = `${window.config.AppSubUrl}/admin/images`
         }
     })