diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index c77ebe704..413ed9692 100644 --- a/app/controllers/admin_controller.rb +++ b/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 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c26ec07e..47251cf85 100644 --- a/app/controllers/application_controller.rb +++ b/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 diff --git a/app/models/phone_app_version.rb b/app/models/phone_app_version.rb index abf4c54e3..4dc1503c9 100644 --- a/app/models/phone_app_version.rb +++ b/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 diff --git a/app/views/admin/mobile_version.html.erb b/app/views/admin/mobile_version.html.erb index 293b0ec46..0d38b449a 100644 --- a/app/views/admin/mobile_version.html.erb +++ b/app/views/admin/mobile_version.html.erb @@ -1,9 +1,17 @@
+ + <%= text_field_tag 'version', params[:version],:value => @new_version.version, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %> +
++ + <%= text_field_tag 'description', params[:description],:value => @new_version.description,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %> +
+ <%= submit_tag l(:button_save), :class => "small", :name => nil %> + <% end %>