ums 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d9ada20fb4e90a24b5768a8be07a6a34d28ac5f
-  data.tar.gz: 9370cf0cbb9766db9067553e7de63a6f14c7567b
+  metadata.gz: 5101be15cbdf7965aaee189cb36a08c9562daec7
+  data.tar.gz: e8a1c75f9569e1a5eb75c6f912995b40199decde
 SHA512:
-  metadata.gz: 1f3b68ca93f4ced6980cd52f00650d7c7e59471ca1192fade522ecc4fd9c9dd301667a33df5164709be1173861cca84b4a6533bf551c447984b8a1abd258bdd8
-  data.tar.gz: 53655b3ddc211f3e326f84a6ca3794b84ee850690d8ed0735ce08eabf0ddbac364d537ae6997f3cd19723574521c0ce66fadef3c320b61abf5d88d6cc5a8c4ff
+  metadata.gz: 7a17f81f6c8d738582086e90a32b2beaa83e9eab64b762a0fcc7f513a945d123b6fe59b475baa28bf7e04cb8e3513128267eedfbe0fe560cf87b3eacb9fa33b0
+  data.tar.gz: c023ec6279fc0492952656e8dc1075455daf956152c4372436b6ce2295261a407890aa5aeee510fcd01a37e7f120bc8a2395b9e0c4997468572b5b9050033ee8

data/app/controllers/ums/users_controller.rb

@@ -50,7 +50,7 @@ class Ums::UsersController < ApplicationController
         session[:user_permission] = user_permission
 
         respond_to do |format|
-          format.html { redirect_to  uri || main_index_path }
+          format.html { redirect_to  uri || root_path }
           format.json { render json: {is_success:"true",message:"登录成功",user:user} }
         end
 
@@ -74,7 +74,7 @@ class Ums::UsersController < ApplicationController
     session[:last_login_ip] = nil
     session[:login_count] = nil
     #flash[:notice] = "已退出"
-    redirect_to  '/' #main_index_path
+    redirect_to  '/' 
   end
 
   def password

data/app/models/ums/function.rb

@@ -2,4 +2,5 @@ class Ums::Function < ActiveRecord::Base
 	has_and_belongs_to_many :roles
     validates_presence_of :name
     validates_presence_of :controller
+    validates_uniqueness_of :name
 end

data/app/models/ums/role.rb

@@ -1,4 +1,5 @@
 class Ums::Role < ActiveRecord::Base
 	has_and_belongs_to_many :functions
 	validates_presence_of :name
+	validates_uniqueness_of :name
 end

data/app/views/ums/functions/_form.html.erb

@@ -24,7 +24,7 @@
     <%= f.text_field :action %>
   </div>
   <div class="actions">
-        <%= f.submit ' 保存 ',:class => 'btn btn-primary'%>
+        <%= f.submit ' 保存 ',:class => 'btn btn-primary', data: { disable_with: '正在保存...' } %>
     &nbsp;&nbsp;
     <%= link_to ' 返回 ', ums.functions_path,:class => "btn btn-default" %>
   </div>

data/app/views/ums/roles/_form.html.erb

@@ -25,7 +25,7 @@
       <% end %>
   </div>
   <div class="actions">
-    <%= f.submit ' 保存 ',:class => 'btn btn-primary'%>
+    <%= f.submit ' 保存 ',:class => 'btn btn-primary',data: { disable_with: '正在保存...' }%>
     &nbsp;&nbsp;
     <%= link_to ' 返回 ', ums.roles_path,:class => "btn btn-default" %>
   </div>

data/app/views/ums/users/_form.html.erb

@@ -36,7 +36,7 @@
     <%= f.check_box :is_enabled %>
   </div>
   <div class="actions">
-    <%= f.submit ' 保存 ',:class => 'btn btn-primary'%>
+    <%= f.submit ' 保存 ',:class => 'btn btn-primary',data: { disable_with: '正在保存...' }%>
     &nbsp;&nbsp;
     <%= link_to ' 返回 ', ums.users_path,:class => "btn btn-default" %>
   </div>

data/lib/ums/version.rb

@@ -1,3 +1,3 @@
 module Ums
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ums
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - wangfuhai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails