Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/admin_controller.rb

@@ -337,7 +337,28 @@ class AdminController < ApplicationController
   end
 
   def create_version
-
+    @versions = PhoneAppVersion.reorder('created_at desc')
+    @new_version = PhoneAppVersion.new
+    @new_version.version = params[:version]
+    @new_version.description = params[:description]
+    if @new_version.save
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_successful_create)
+          redirect_to mobile_version_url
+        }
+        format.api  { render_api_ok }
+      end
+    else
+      respond_to do |format|
+        flash.now[:error] = "#{l :label_version_create_fail}: #{@new_version.errors.full_messages[0]}"
+        #flash.now[:error] = "#{l :label_first_page_create_fail}: #{@course_page.errors.full_messages[0]}"
+        format.html {
+          render :action => 'mobile_version'
+        }
+        format.api  { render_validation_errors(@new_version) }
+      end
+    end
   end
 
 end

app/controllers/application_controller.rb

@@ -181,6 +181,9 @@ class ApplicationController < ActionController::Base
     #从手机端传来apptoken则将当前登陆用户变为对应的用户
     if params[:apptoken]
       token = ApiKey.where(access_token: params[:apptoken]).first
+      if token.expired?
+        return
+      end
       if token && !token.expired?
         @current_user = User.find(token.user_id)
       end

app/models/phone_app_version.rb

@@ -1,3 +1,5 @@
 class PhoneAppVersion < ActiveRecord::Base
   attr_accessible :description, :version
+  validates_presence_of :description, :version
+  validates_uniqueness_of :version
 end

app/views/admin/mobile_version.html.erb

@@ -1,9 +1,17 @@
 <h3><%= l(:label_mobile_version) %></h3>
 <a href="javascript:void(0)" onclick="$('#new_version').slideToggle(400); ">发布新版本</a>
 <div>
-  <form id="new_version" style="display: none">
+  <%= form_tag({:controller => 'admin', :action => 'create_version'},{:id => 'new_version',:style=>'display:none'}) do %>
-    发布新版本
+      <p style="margin-left:60px;padding-right: 20px;">
-  </form>
+        <label for='version'><%= l(:label_version_number) %>:</label>
+        <%= text_field_tag 'version', params[:version],:value => @new_version.version, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+      </p>
+      <p style="margin-left:60px;padding-right: 20px;">
+        <label for='description'><%= l(:label_version_description)%>:</label>
+        <%= text_field_tag  'description', params[:description],:value => @new_version.description,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+      </p>
+      <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+  <% end %>
 </div>
 <br/>
 <div>当前版本:</div>

config/locales/zh.yml

@@ -559,8 +559,8 @@ zh:
   label_organizer_name: 主办单位名称
   label_web_footer_description: 页脚内容
   label_cooperation_compnay: 合作单位
-  label_version_number: 版本号
+  label_version_number: 版本
-  label_version_description: 版本描述
+  label_version_description: 描述
   label_web_footer_cooperation_compnay: 网站页脚合作单位
   label_new_company: 添加合作单位
   label_edit_company: 编辑合作单位
@@ -1979,6 +1979,7 @@ zh:
   label_forum_update_succ: 贴吧更新成功
   label_forum_update_fail: 贴吧更新失败
   label_first_page_create_fail: 首页定制失败
+  label_version_create_fail: 版本发布失败
   label_forum_edit: 编辑讨论区
   label_memo_create: 发布
   label_memo_new: 新建帖子